chore(postgresql-cluster): adjust

Author: EamonZhang

addons/postgresql-cluster/15/chart/postgresql-cluster/README.md

@@ -71,13 +71,22 @@ backup:
 
 - Login database web with admin user & password
 
+- Change administrator initial password 
+```
+ALTER USER  administrator WITH ENCRYPTED PASSWORD 'newpassword';
+```
+- View total connections number in postgresql cluster;
+```
+show max_connections ;
+```
 - CREATE APP USER
 ```
-CREATE USER `my_user` WITH CONNECTION LIMIT `conn_limit` LOGIN ENCRYPTED PASSWORD 'password';
+CREATE USER `myuser` WITH CONNECTION LIMIT `conn limit` LOGIN ENCRYPTED PASSWORD 'password';
+GRANT `myuser` to administrator ;
 ```
 - CREATE APP DATABASE
 ```
-CREATE DATABASE `my_db` OWNER `my_user`;
+CREATE DATABASE `mydb` OWNER `myuser`;
 ```
 - CREATE EXTENSIONS
 ```

addons/postgresql-cluster/15/chart/postgresql-cluster/templates/cm-backup.yaml

@@ -1,4 +1,3 @@
-{{- if (include "backup.createConfigmap" .) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -14,9 +13,4 @@ metadata:
   {{- end }}
 data:
   backup.env: |-
-    {{- include "common.tplvalues.render" ( dict "value" .Values.backupEnv "context" $ ) | nindent 4 }}
-  # archive_command.sh: | -
-  #   #/bin/bash
-  #   source backup.env 
-  #   [ $USE_WALG ] ? sh /opt/drycc/postgresql/walbackup.sh %p : /bin/true
-{{- end -}}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.backupEnv "context" $ ) | nindent 4 }}

addons/postgresql-cluster/15/chart/postgresql-cluster/templates/sec.yaml

@@ -14,5 +14,5 @@ data:
   password-superuser: {{ include "credentials.superuserValue" . | b64enc | quote }}
   password-rewind: {{ include "credentials.rewindValue" . | b64enc | quote }}
   password-replication: {{ include "credentials.replicationValue" . | b64enc | quote  }} 
-  admin-user: {{ .Values.adminRole.username | b64enc }}
-  admin-password: {{ .Values.adminRole.password | b64enc }}
+  admin-user: {{ .Values.adminRole.username | b64enc | quote }}
+  admin-password: {{ include "adminRole.passwordValue" . | b64enc | quote }}

addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml

@@ -161,7 +161,7 @@ spec:
         resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
         {{- end }}
       {{- end }}
-       {{- if .Values.backup.enabled }}
+
       - name: {{ .Chart.Name }}-backup
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -195,7 +195,7 @@ spec:
         volumeMounts:
         - name: storage-volume
           mountPath: "{{ .Values.persistentVolume.mountPath }}" 
-      {{- end }}
+      
      {{- with .Values.nodeSelector }} 
       nodeSelector:
 {{ toYaml . | indent 8 }}

addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml

@@ -124,8 +124,8 @@ postInitScript: |
   psql -w -c  "CREATE USER tea_mon WITH ROLE pg_monitor;create extension pg_stat_statements;create extension pg_buffercache ;"
   # Create admin  user 
   if [[( -n "$ADMIN_USER") &&  ( -n "$ADMIN_PASSWORD")]]; then
-     echo "Creating user ${ADMIN_USER}"
-    # psql -w -c "CREATE USER ${ADMIN_USER} WITH NOSUPERUSER CREATEDB CREATEROLE REPLICATION CONNECTION LIMIT 10 LOGIN ENCRYPTED PASSWORD '${ADMIN_PASSWORD}'"
+    echo "Creating user ${ADMIN_USER}"
+    psql -w -c "CREATE USER ${ADMIN_USER} WITH SUPERUSER CREATEDB CREATEROLE CONNECTION LIMIT 10 LOGIN ENCRYPTED PASSWORD '${ADMIN_PASSWORD}'"
   else
     echo "Skipping create admin user"
   fi

addons/postgresql-cluster/15/meta.yaml

@@ -13,14 +13,12 @@ tags: postgresql-cluster
 bindable: true
 instances_retrievable: true
 bindings_retrievable: true
-plan_updateable: false
+plan_updateable: true
 allow_parameters:
 - name: "networkPolicy.allowNamespaces"
   description: "networkPolicy allowNamespaces config for values.yaml"
 - name: "service.type"
   description: "service type config for values.yaml"
-- name: "metrics.enabled"
-  description: "Whether to enable metrics. default true"
 - name: "backup"
   description: "Whether to use S3 for backup your data. default false . ps: Make sure there is a available S3 "
 archive: false

addons/postgresql-cluster/15/plans/standard-10/bind.yaml

@@ -21,20 +21,17 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-name }' 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-password }' 
+        jsonpath: '{ .data.admin-password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-user }' 
+        jsonpath: '{ .data.admin-user }' 
   - name: PORT
-    value: 5432
+    value: 5432
+  - name: DADABASE
+    value: postgres

addons/postgresql-cluster/15/plans/standard-100/bind.yaml

@@ -21,20 +21,17 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-name }' 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-password }' 
+        jsonpath: '{ .data.admin-password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-user }' 
+        jsonpath: '{ .data.admin-user }' 
   - name: PORT
-    value: 5432
+    value: 5432
+  - name: DADABASE
+    value: postgres

addons/postgresql-cluster/15/plans/standard-20/bind.yaml

@@ -21,20 +21,17 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-name }' 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-password }' 
+        jsonpath: '{ .data.admin-password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-user }' 
+        jsonpath: '{ .data.admin-user }' 
   - name: PORT
-    value: 5432
+    value: 5432
+  - name: DADABASE
+    value: postgres

addons/postgresql-cluster/15/plans/standard-200/bind.yaml

@@ -21,20 +21,17 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  - name: DADABASE
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-name }' 
   - name: PASSWORD
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-password }' 
+        jsonpath: '{ .data.admin-password }' 
   - name: USERNAME
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.data-user }' 
+        jsonpath: '{ .data.admin-user }' 
   - name: PORT
-    value: 5432
+    value: 5432
+  - name: DADABASE
+    value: postgres