diff --git a/catalog/active_versions.json b/catalog/active_versions.json index 18ec82ec4..cd65e58cf 100644 --- a/catalog/active_versions.json +++ b/catalog/active_versions.json @@ -110,6 +110,8 @@ "1.7.1" ], "Postgres": [ + "14.0", + "14.0-debian", "timescaledb-2.1.0-pg13", "13.2", "13.2-debian", diff --git a/catalog/backup_tasks.json b/catalog/backup_tasks.json index 665b0ccba..51ef4ee2f 100644 --- a/catalog/backup_tasks.json +++ b/catalog/backup_tasks.json @@ -149,6 +149,10 @@ "13.2", "13.2-debian" ], + "postgres-backup-14.0": [ + "14.0", + "14.0-debian" + ], "postgres-backup-9.6.19": [ "9.6.21", "9.6.21-debian" diff --git a/catalog/raw/postgres/postgres-14.0-postgresql.yaml b/catalog/raw/postgres/postgres-14.0-postgresql.yaml new file mode 100644 index 000000000..a2a68f583 --- /dev/null +++ b/catalog/raw/postgres/postgres-14.0-postgresql.yaml @@ -0,0 +1,54 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: 14.0-debian +spec: + coordinator: + image: kubedb/pg-coordinator:panic-issue_linux_amd64 + db: + image: postgres:14.0 + distribution: PostgreSQL + exporter: + image: prometheuscommunity/postgres-exporter:v0.9.0 + initContainer: + image: kubedb/postgres-init:0.3.0 + podSecurityPolicies: + databasePolicyName: postgres-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 999 + stash: + addon: + backupTask: + name: postgres-backup-14.0 + restoreTask: + name: postgres-restore-14.0 + version: "14.0" + +--- +apiVersion: catalog.kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: "14.0" +spec: + coordinator: + image: kubedb/pg-coordinator:panic-issue_linux_amd64 + db: + image: postgres:14.0-alpine + distribution: PostgreSQL + exporter: + image: prometheuscommunity/postgres-exporter:v0.9.0 + initContainer: + image: kubedb/postgres-init:0.3.0 + podSecurityPolicies: + databasePolicyName: postgres-db + securityContext: + runAsAnyNonRoot: false + runAsUser: 70 + stash: + addon: + backupTask: + name: postgres-backup-14.0 + restoreTask: + name: postgres-restore-14.0 + version: "14.0" diff --git a/catalog/restore_tasks.json b/catalog/restore_tasks.json index 8bc3e106b..429b99488 100644 --- a/catalog/restore_tasks.json +++ b/catalog/restore_tasks.json @@ -149,6 +149,10 @@ "13.2", "13.2-debian" ], + "postgres-restore-14.0": [ + "14.0", + "14.0-debian" + ], "postgres-restore-9.6.19": [ "9.6.21", "9.6.21-debian" diff --git a/charts/kubedb-catalog/templates/postgres/postgres-14.0-postgresql.yaml b/charts/kubedb-catalog/templates/postgres/postgres-14.0-postgresql.yaml new file mode 100644 index 000000000..96a302a44 --- /dev/null +++ b/charts/kubedb-catalog/templates/postgres/postgres-14.0-postgresql.yaml @@ -0,0 +1,62 @@ +{{ if .Values.catalog.postgres }} +apiVersion: catalog.kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: '14.0-debian' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + coordinator: + image: '{{ include "catalog.registry" . }}/pg-coordinator:panic-issue_linux_amd64' + db: + image: '{{ include "official.registry" (set (.Values | deepCopy) "officialRegistry" (list "postgres")) }}:14.0' + distribution: PostgreSQL + exporter: + image: '{{ include "official.registry" (set (.Values | deepCopy) "officialRegistry" (list "prometheuscommunity" "postgres-exporter")) }}:v0.9.0' + initContainer: + image: '{{ include "catalog.registry" . }}/postgres-init:0.3.0' + podSecurityPolicies: + databasePolicyName: postgres-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 999 + stash: + addon: + backupTask: + name: postgres-backup-14.0 + restoreTask: + name: postgres-restore-14.0 + version: "14.0" +{{ end }} + +--- +{{ if .Values.catalog.postgres }} +apiVersion: catalog.kubedb.com/v1alpha1 +kind: PostgresVersion +metadata: + name: '14.0' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + coordinator: + image: '{{ include "catalog.registry" . }}/pg-coordinator:panic-issue_linux_amd64' + db: + image: '{{ include "official.registry" (set (.Values | deepCopy) "officialRegistry" (list "postgres")) }}:14.0-alpine' + distribution: PostgreSQL + exporter: + image: '{{ include "official.registry" (set (.Values | deepCopy) "officialRegistry" (list "prometheuscommunity" "postgres-exporter")) }}:v0.9.0' + initContainer: + image: '{{ include "catalog.registry" . }}/postgres-init:0.3.0' + podSecurityPolicies: + databasePolicyName: postgres-db + securityContext: + runAsAnyNonRoot: false + runAsUser: 70 + stash: + addon: + backupTask: + name: postgres-backup-14.0 + restoreTask: + name: postgres-restore-14.0 + version: "14.0" +{{ end }} diff --git a/go.mod b/go.mod index 16cf78608..84544b396 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 kmodules.xyz/schema-checker v0.1.3 sigs.k8s.io/yaml v1.2.0 - stash.appscode.dev/installer v0.12.2-0.20210909044138-01ecae580c8c + stash.appscode.dev/installer v0.12.2-0.20211007063844-5e8dc3cd6620 ) replace gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.3.0 diff --git a/go.sum b/go.sum index b97a0ef51..88158707e 100644 --- a/go.sum +++ b/go.sum @@ -689,7 +689,6 @@ k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-aggregator v0.21.1/go.mod h1:cAZ0n02IiSl57sQSHz4vvrz3upQRMbytOiZnpPJaQzQ= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32 h1:ZXVJStHHjppRoaUw5JQ5KzMjK+EiY1GkcPigPHfkvSg= kmodules.xyz/client-go v0.0.0-20210921150324-f005c6dfcb32/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= kmodules.xyz/schema-checker v0.1.2/go.mod h1:JyT3tjizU/gQY9bK56xzAvkjJoAaUPRam7HELx4Nb/o= @@ -708,5 +707,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -stash.appscode.dev/installer v0.12.2-0.20210909044138-01ecae580c8c h1:A5Nt4lmPTx5ff38JCAKFMdasR7FWXQC52xD2L9KCz1E= -stash.appscode.dev/installer v0.12.2-0.20210909044138-01ecae580c8c/go.mod h1:edjZldkJL0iYDElFjaUVi7fcftTFZ23C1zx7cPKrEns= +stash.appscode.dev/installer v0.12.2-0.20211007063844-5e8dc3cd6620 h1:7d7AUuQji5WYgygeEIr78ITswCoZkt54D1KRxWko23E= +stash.appscode.dev/installer v0.12.2-0.20211007063844-5e8dc3cd6620/go.mod h1:USGEb3BkysH9hqGEJp/xvHL1Ffqi9XNLza5DGdyeJBQ= diff --git a/vendor/modules.txt b/vendor/modules.txt index 7d374114f..2ddd1e7a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -173,7 +173,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit sigs.k8s.io/yaml -# stash.appscode.dev/installer v0.12.2-0.20210909044138-01ecae580c8c +# stash.appscode.dev/installer v0.12.2-0.20211007063844-5e8dc3cd6620 ## explicit stash.appscode.dev/installer/catalog # gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.3.0 diff --git a/vendor/stash.appscode.dev/installer/catalog/catalog.json b/vendor/stash.appscode.dev/installer/catalog/catalog.json index ba9e691a9..50341fa32 100644 --- a/vendor/stash.appscode.dev/installer/catalog/catalog.json +++ b/vendor/stash.appscode.dev/installer/catalog/catalog.json @@ -67,7 +67,8 @@ "10.14-v10", "11.9-v10", "12.4-v10", - "13.1-v7" + "13.1-v7", + "14.0" ] }, {