Merge pull request #14 from jianxiaoguo/main

fixup(postgres): user name converted to lowercase letters

Author: duanhongyi

Dockerfile

@@ -10,7 +10,8 @@ ENV PGDATA /data/${PG_MAJOR}
 
 RUN install-packages gcc \
   && install-stack python $PYTHON_VERSION \
-  && install-stack postgresql $POSTGRESQL_VERSION && . init-stack \
+  && install-stack postgresql $POSTGRESQL_VERSION \
+  && . init-stack \
   && set -eux; pip3 install --disable-pip-version-check --no-cache-dir psycopg[binary] patroni[kubernetes] 2>/dev/null; set +eux \
   && apt-get purge -y --auto-remove gcc \
   && apt-get autoremove -y \

charts/database/templates/database-secret-creds.yaml

@@ -9,10 +9,10 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install
 data:
-  superuser: {{ if .Values.superuser | default "" | ne "" }}{{ .Values.superuser | b64enc }}{{ else }}{{ randAlpha 32 | b64enc }}{{ end }}
+  superuser: {{ if .Values.superuser | default "" | ne "" }}{{ .Values.superuser | lower | b64enc }}{{ else }}{{ randAlpha 32 | lower | b64enc }}{{ end }}
   superuser-password: {{ if .Values.superuserPassword | default "" | ne "" }}{{ .Values.superuserPassword | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  replicator: {{ if .Values.replicator | default "" | ne "" }}{{ .Values.replicator | b64enc }}{{ else }}{{ randAlpha 32 | b64enc }}{{ end }}
+  replicator: {{ if .Values.replicator | default "" | ne "" }}{{ .Values.replicator | lower | b64enc }}{{ else }}{{ randAlpha 32 | lower | b64enc }}{{ end }}
   replicator-password: {{ if .Values.replicatorPassword | default "" | ne "" }}{{ .Values.replicatorPassword | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  user: {{ if .Values.user | default "" | ne "" }}{{ .Values.user | b64enc }}{{ else }}{{ randAlpha 32 | b64enc }}{{ end }}
+  user: {{ if .Values.user | default "" | ne "" }}{{ .Values.user | lower | b64enc }}{{ else }}{{ randAlpha 32 | lower | b64enc }}{{ end }}
   password: {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
 {{- end }}

charts/database/templates/database-service.yaml

@@ -12,7 +12,6 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - name: postgres
-      port: 5432
+    - port: 5432
       targetPort: 5432
 {{- end }}

charts/database/values.yaml

@@ -48,7 +48,8 @@ persistence:
   ## If the PV uses a different storage class, specify that here.
   storageClass: ""
 # The username and password to be used by the on-cluster database.
-# If left empty they will be generated using randAlphaNum
+# If left empty they will be generated
+# The user name should be set to lowercase letters 
 superuser: "postgres"
 superuserPassword: ""
 replicator: "standby"