diff --git a/Makefile b/Makefile index c006a24..763f730 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,9 @@ helm-package: cd platforms/kubernetes/postgres-operator/deploy/; \ /bin/rm -rf platforms/kubernetes/postgres-operator/deploy/postgres-operator/; \ cp -r helm_template/postgres-operator/ ./postgres-operator; \ - awk -f jq-template.awk postgres-operator.yaml.template > postgres-operator/templates/postgres-operator.yaml; \ + mkdir -p postgres-operator/crds; \ + awk -f jq-template.awk postgres-operator.yaml.template | grep -B 99999 "crds is end" > postgres-operator/crds/postgres-crds.yaml; \ + awk -f jq-template.awk postgres-operator.yaml.template | grep -A 99999 "crds is end" > postgres-operator/templates/postgres-operator.yaml; \ awk -f jq-template.awk postgres-operator/Chart.yaml.template > postgres-operator/Chart.yaml; \ awk -f jq-template.awk postgres-operator/values.yaml.template > postgres-operator/values.yaml; \ /bin/rm postgres-operator/Chart.yaml.template postgres-operator/values.yaml.template; diff --git a/docs/index.yaml b/docs/index.yaml index b5d21a7..a27f453 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,7 +3,31 @@ entries: postgres-operator: - apiVersion: v2 appVersion: v1.2.2 - created: "2023-10-12T19:26:31.660243684+08:00" + created: "2023-10-13T15:01:46.936562418+08:00" + description: A Helm chart for Kubernetes + digest: 92597473448348a9ef6ee132e784893544b5e86bda47f3c2db09fec46eaaa191 + home: https://github.com/radondb/multi-platform-postgresql + keywords: + - operator + - postgresql + - database + maintainers: + - email: lianzhuangzhang@yunify.com + name: lzzhang + url: https://lzzhang.github.io/ + - email: yanbo2695388808@gmail.com + name: yanboer + url: https://yanboer.github.io/ + name: postgres-operator + sources: + - https://github.com/radondb/multi-platform-postgresql + type: application + urls: + - https://radondb.github.io/multi-platform-postgresql/postgres-operator-v1.2.4.tgz + version: v1.2.4 + - apiVersion: v2 + appVersion: v1.2.2 + created: "2023-10-13T15:01:46.936165894+08:00" description: A Helm chart for Kubernetes digest: 8c3d8ad38c47b883658433155c07102f7672a07abce03865c0b54d08c318996e home: https://github.com/radondb/multi-platform-postgresql @@ -27,7 +51,7 @@ entries: version: v1.2.3 - apiVersion: v2 appVersion: v1.2.2 - created: "2023-10-12T19:26:31.660011009+08:00" + created: "2023-10-13T15:01:46.93577411+08:00" description: A Helm chart for Kubernetes digest: 8bac6454e30fe8d775f995e3afaf3e03d94413b58bbaa128ae66507334d3ac99 home: https://github.com/radondb/multi-platform-postgresql @@ -51,7 +75,7 @@ entries: version: v1.2.2 - apiVersion: v2 appVersion: v1.2.0 - created: "2023-10-12T19:26:31.65944128+08:00" + created: "2023-10-13T15:01:46.93527508+08:00" description: A Helm chart for Kubernetes digest: 8d1a597a8c52041b8d9d391188d4749abe00f3083e31036000edb0c15975df4e home: https://github.com/radondb/multi-platform-postgresql @@ -75,7 +99,7 @@ entries: version: v1.2.0 - apiVersion: v2 appVersion: v1.1.1 - created: "2023-10-12T19:26:31.658932584+08:00" + created: "2023-10-13T15:01:46.934375781+08:00" description: A Helm chart for Kubernetes digest: 4a536a53eed956e2cf28ffe2addf0625031de1f2581ce40884be94490923d5a2 home: https://github.com/radondb/multi-platform-postgresql @@ -99,7 +123,7 @@ entries: version: v1.0.1 - apiVersion: v2 appVersion: v1.1.0 - created: "2023-10-12T19:26:31.658207785+08:00" + created: "2023-10-13T15:01:46.933854975+08:00" description: A Helm chart for Kubernetes digest: 1f6593413ae373c5caa7b8c41a3cd3697fbb164ba417260a3fefa6d32a1852e8 home: https://github.com/radondb/multi-platform-postgresql @@ -121,4 +145,4 @@ entries: urls: - https://radondb.github.io/multi-platform-postgresql/postgres-operator-v1.0.0.tgz version: v1.0.0 -generated: "2023-10-12T19:26:31.657669301+08:00" +generated: "2023-10-13T15:01:46.933148777+08:00" diff --git a/docs/postgres-operator-v1.2.4.tgz b/docs/postgres-operator-v1.2.4.tgz new file mode 100644 index 0000000..9180074 Binary files /dev/null and b/docs/postgres-operator-v1.2.4.tgz differ diff --git a/helmversions.json b/helmversions.json index cd4bd30..ed58a0a 100644 --- a/helmversions.json +++ b/helmversions.json @@ -1,6 +1,6 @@ { "appVersion": "v1.2.2", - "version": "v1.2.3", + "version": "v1.2.4", "template_name": "radondb-postgres-operator", "template_image": "radondb/radondb-postgres-operator:v1.2.2", diff --git a/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml b/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml index 8f1fcb2..cb3b009 100644 --- a/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml +++ b/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml @@ -2,7 +2,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: postgresqls.postgres.radondb.io - namespace: radondb-postgres-operator spec: group: postgres.radondb.io names: @@ -469,7 +468,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: postgresqlbackups.postgres.radondb.io - namespace: radondb-postgres-operator spec: group: postgres.radondb.io names: @@ -581,6 +579,7 @@ spec: - false default: false description: "Delete S3 data when backup is deleted." +# crds is end --- apiVersion: v1 kind: ServiceAccount diff --git a/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template b/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template index 3e9dc18..54a9c2d 100644 --- a/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template +++ b/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template @@ -2,7 +2,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: postgresqls.postgres.radondb.io - namespace: {{ .namespace }} spec: group: postgres.radondb.io names: @@ -469,7 +468,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: postgresqlbackups.postgres.radondb.io - namespace: {{ .namespace }} spec: group: postgres.radondb.io names: @@ -581,6 +579,7 @@ spec: - false default: false description: "Delete S3 data when backup is deleted." +# crds is end --- apiVersion: v1 kind: ServiceAccount