From b38ae679bea3130fdaaf38656a49b9e8ff3ec8a4 Mon Sep 17 00:00:00 2001 From: lzzhang Date: Fri, 13 Oct 2023 15:03:06 +0800 Subject: [PATCH] helm add crds dir --- Makefile | 4 +- docs/index.yaml | 36 +++++++++++++++--- docs/postgres-operator-v1.2.4.tgz | Bin 0 -> 4589 bytes helmversions.json | 2 +- .../deploy/postgres-operator.yaml | 3 +- .../deploy/postgres-operator.yaml.template | 3 +- 6 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 docs/postgres-operator-v1.2.4.tgz 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 0000000000000000000000000000000000000000..9180074fb7c63cec7e17d11719ef11737224350e GIT binary patch literal 4589 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 X=ki>hPWj&e00960NI{Fn0Du4hQO)CZ literal 0 HcmV?d00001 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