Merge pull request #9 from radondb/V3.0.0-helm-package

zlianzhuang · web-flow · commit e743c0b25f09 · 2022-10-26T11:12:42.000+08:00
V3.0.0 helm package
diff --git a/Makefile b/Makefile
@@ -33,6 +33,19 @@ operator-yaml: operator-image
 	cp operatorversions.json platforms/kubernetes/postgres-operator/deploy/versions.json
 	cp jq-template.awk platforms/kubernetes/postgres-operator/deploy/jq-template.awk
 	cd platforms/kubernetes/postgres-operator/deploy/; awk -f jq-template.awk postgres-operator.yaml.template > postgres-operator.yaml
+helm-package:
+	cp helmversions.json platforms/kubernetes/postgres-operator/deploy/versions.json
+	cp jq-template.awk platforms/kubernetes/postgres-operator/deploy/jq-template.awk
+	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; \
+		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;
+	helm package -d ./docs platforms/kubernetes/postgres-operator/deploy/postgres-operator/
+	helm repo index --url https://github.com/radondb/multi-platform-postgresql ./docs
+	/bin/rm -rf platforms/kubernetes/postgres-operator/deploy/postgres-operator/
 exporter-image:
 	cp exporterversions.json image/exporter/versions.json
 	cd image/exporter; ./generate_image.sh
diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>PostgreSQL Cluster Chart repo</title>
+  </head>
+  <body>
+    <h1>PostgreSQL Cluster Charts Repo</h1>
+    <p>Point Helm at this repo to see charts.</p>
+  </body>
+</html>
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+entries:
+  postgres-operator:
+  - apiVersion: v2
+    appVersion: v0.9.0
+    created: "2022-10-26T11:06:47.328798458+08:00"
+    description: A Helm chart for Kubernetes
+    digest: 7376d2cd16c5940b0fe3eaac3c737f983c334fbacfaeb080549d98b67514cd27
+    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://github.com/radondb/multi-platform-postgresql/postgres-operator-v1.0.0.tgz
+    version: v1.0.0
+generated: "2022-10-26T11:06:47.32779683+08:00"
diff --git a/docs/postgres-operator-v1.0.0.tgz b/docs/postgres-operator-v1.0.0.tgz
diff --git a/helmversions.json b/helmversions.json
@@ -0,0 +1,18 @@
+{
+  "appVersion": "v0.9.0",
+  "version": "v1.0.0",
+
+  "template_name": "radondb-postgres-operator",
+  "template_image": "radondb/radondb-postgres-operator:v0.9.0",
+
+  "namespace": "{{ .Release.Namespace }}",
+  "account": "radondb-postgres-operator-account",
+  "clusterrole": "radondb-postgres-operator-cluster",
+  "role": "radondb-postgres-operator-role",
+  "clusterrolebinding": "radondb-postgres-operator-rolebinding-cluster",
+  "rolebinding": "radondb-postgres-operator-rolebinding-role",
+  "name": "{{ .Values.operator.name }}",
+  "image": "{{ .Values.operator.image }}",
+  "datapath": "/data"
+}
+
diff --git a/operatorversions.json b/operatorversions.json
@@ -6,6 +6,6 @@
   "clusterrolebinding": "radondb-postgres-operator-rolebinding-cluster",
   "rolebinding": "radondb-postgres-operator-rolebinding-role",
   "name": "radondb-postgres-operator",
-  "image": "radondb-postgres-operator:v0.9.0",
+  "image": "radondb/radondb-postgres-operator:v0.9.0",
   "datapath": "/data"
 }
diff --git a/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/.helmignore b/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/Chart.yaml.template b/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/Chart.yaml.template
@@ -0,0 +1,23 @@
+apiVersion: v2
+appVersion: {{ .appVersion }}
+version: {{ .version }}
+name: postgres-operator
+description: A Helm chart for Kubernetes
+type: application
+home: https://github.com/radondb/multi-platform-postgresql
+
+keywords:
+  - operator
+  - postgresql
+  - database
+
+sources:
+  - https://github.com/radondb/multi-platform-postgresql
+
+maintainers:
+  - name: lzzhang
+    email: lianzhuangzhang@yunify.com
+    url: https://lzzhang.github.io/
+  - name: yanboer
+    email: yanbo2695388808@gmail.com
+    url: https://yanboer.github.io/
diff --git a/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/templates/.gitignore b/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/templates/.gitignore
diff --git a/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/values.yaml.template b/platforms/kubernetes/postgres-operator/deploy/helm_template/postgres-operator/values.yaml.template
@@ -0,0 +1,3 @@
+operator:
+  name: {{ .template_name }}
+  image: {{ .template_image }}
diff --git a/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml b/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml
@@ -1,9 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: radondb-postgres-operator
-
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
diff --git a/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template b/platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml.template
@@ -1,9 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .namespace }}
-
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`"clusterrolebinding": "radondb-postgres-operator-rolebinding-cluster",`
`7`	`7`	`"rolebinding": "radondb-postgres-operator-rolebinding-role",`
`8`	`8`	`"name": "radondb-postgres-operator",`
`9`		`- "image": "radondb-postgres-operator:v0.9.0",`
	`9`	`+ "image": "radondb/radondb-postgres-operator:v0.9.0",`
`10`	`10`	`"datapath": "/data"`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+operator:`
	`2`	`+ name: {{ .template_name }}`
	`3`	`+ image: {{ .template_image }}`