megre(addons): megre from upstream

Author: EamonZhang

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

@@ -71,7 +71,6 @@ backup:
 
 - Login database web with admin user & password
 
-<<<<<<< HEAD
 - Change administrator initial password 
 ```
 ALTER USER  administrator WITH ENCRYPTED PASSWORD 'newpassword';
@@ -88,15 +87,7 @@ GRANT `myuser` to administrator ;
 - CREATE APP DATABASE
 ```
 CREATE DATABASE `mydb` OWNER `myuser`;
-=======
-- CREATE APP USER
-```
-CREATE USER `my_user` WITH CONNECTION LIMIT `conn_limit` LOGIN ENCRYPTED PASSWORD 'password';
-```
-- CREATE APP DATABASE
-```
-CREATE DATABASE `my_db` OWNER `my_user`;
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
+
 ```
 - CREATE EXTENSIONS
 ```

addons/postgresql-cluster/15/chart/postgresql-cluster/templates/_helpers.tpl

@@ -189,11 +189,7 @@ Get the administrator password ;
 {{- if .Values.adminRole.password }}
     {{- .Values.adminRole.password -}}
 {{- else -}}
-<<<<<<< HEAD
   {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "admin-password")  -}}
-=======
-  {{- include "getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "common.names.fullname" .) "Length" 10 "Key" "password-replication")  -}}
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
 {{- end -}}
 {{- end }}
 

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

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-{{- if (include "backup.createConfigmap" .) }}
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -17,13 +13,5 @@ metadata:
   {{- end }}
 data:
   backup.env: |-
-<<<<<<< HEAD
     {{- include "common.tplvalues.render" ( dict "value" .Values.backupEnv "context" $ ) | nindent 4 }}
-=======
-    {{- 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 -}}
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
+

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

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

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

@@ -161,11 +161,6 @@ spec:
         resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
         {{- end }}
       {{- end }}
-<<<<<<< HEAD
-
-=======
-       {{- if .Values.backup.enabled }}
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
       - name: {{ .Chart.Name }}-backup
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}

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

@@ -124,13 +124,10 @@ 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
-<<<<<<< HEAD
+
     echo "Creating user ${ADMIN_USER}"
     psql -w -c "CREATE USER ${ADMIN_USER} WITH SUPERUSER CREATEDB CREATEROLE CONNECTION LIMIT 10 LOGIN ENCRYPTED PASSWORD '${ADMIN_PASSWORD}'"
-=======
-     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}'"
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
+
   else
     echo "Skipping create admin user"
   fi

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

@@ -32,10 +32,7 @@ credential:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.admin-user }' 
   - name: PORT
-<<<<<<< HEAD
     value: 5432
   - name: DADABASE
     value: postgres
-=======
-    value: 5432
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
+

addons/postgresql-cluster/15/plans/standard-50/meta.yaml

@@ -1,10 +1,6 @@
 name: "standard-50"
 id: 0542f411-4e7b-46af-966c-c9989e54873c
-<<<<<<< HEAD
 description: "PostgreSQL Cluster standard-50 plan: Disk 50Gi ,vCPUs 2 , RAM 8G , DB MAX Connection 2000"
-=======
-description: "PostgreSQL standard-50 plan: Disk 50Gi ,vCPUs 2 , RAM 8G , DB MAX Connection 2000"
->>>>>>> d9ed1063e1d4d34d5a535bf86bacd2c9d2a31dfd
 displayName: "standard-50"
 bindable: true
 maximum_polling_duration: 1800