Revert "updated"

This reverts commit 4e92a9795ea15dea6a4ed536cea7a1d93d5cd03c.

charts/postgresql/.helmignore

@@ -1,23 +0,0 @@
-# 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
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-# img folder
-img/

charts/postgresql/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.14.1
-digest: sha256:5ccbe5f1fe4459864a8c9d7329c400b678666b6cfb1450818a830bda81995bc3
-generated: "2023-12-20T20:39:13.141839286Z"

charts/postgresql/Chart.yaml

@@ -1,38 +0,0 @@
-# Copyright VMware, Inc.
-# SPDX-License-Identifier: APACHE-2.0
-
-annotations:
-  category: Database
-  licenses: Apache-2.0
-  images: |
-    - name: os-shell
-      image: docker.io/bitnami/os-shell:11-debian-11-r96
-    - name: postgres-exporter
-      image: docker.io/bitnami/postgres-exporter:0.15.0-debian-11-r9
-    - name: postgresql
-      image: docker.io/bitnami/postgresql:16.2.0-debian-11-r1
-apiVersion: v2
-appVersion: 16.2.0
-dependencies:
-- name: common
-  repository: oci://registry-1.docker.io/bitnamicharts
-  tags:
-  - bitnami-common
-  version: 2.x.x
-description: PostgreSQL (Postgres) is an open source object-relational database known for reliability and data integrity. ACID-compliant, it supports foreign keys, joins, views, triggers and stored procedures.
-home: https://bitnami.com
-icon: https://bitnami.com/assets/stacks/postgresql/img/postgresql-stack-220x234.png
-keywords:
-- postgresql
-- postgres
-- database
-- sql
-- replication
-- cluster
-maintainers:
-- name: VMware, Inc.
-  url: https://github.com/bitnami/charts
-name: postgresql
-sources:
-- https://github.com/bitnami/charts/tree/main/bitnami/postgresql
-version: 14.0.4

charts/postgresql/templates/NOTES.txt

@@ -1,115 +0,0 @@
-CHART NAME: {{ .Chart.Name }}
-CHART VERSION: {{ .Chart.Version }}
-APP VERSION: {{ .Chart.AppVersion }}
-
-** Please be patient while the chart is being deployed **
-
-{{- if .Values.diagnosticMode.enabled }}
-The chart has been deployed in diagnostic mode. All probes have been disabled and the command has been overwritten with:
-
-  command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 4 }}
-  args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 4 }}
-
-Get the list of pods by executing:
-
-  kubectl get pods --namespace {{ .Release.Namespace }} -l app.kubernetes.io/instance={{ .Release.Name }}
-
-Access the pod you want to debug by executing
-
-  kubectl exec --namespace {{ .Release.Namespace }} -ti <NAME OF THE POD> -- /opt/bitnami/scripts/postgresql/entrypoint.sh /bin/bash
-
-In order to replicate the container startup scripts execute this command:
-
-    /opt/bitnami/scripts/postgresql/entrypoint.sh /opt/bitnami/scripts/postgresql/run.sh
-
-{{- else }}
-
-{{- $customUser := include "postgresql.v1.username" . }}
-{{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "common.names.fullname" .) "key" .Values.auth.secretKeys.adminPasswordKey "defaultValue" (ternary .Values.auth.postgresPassword .Values.auth.password  (eq $customUser "postgres")) "context" $) -}}
-{{- $authEnabled := and (not (or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret)) (or $postgresPassword .Values.auth.enablePostgresUser (and (not (empty $customUser)) (ne $customUser "postgres"))) }}
-{{- if not $authEnabled }}
-
-WARNING: PostgreSQL has been configured without authentication, this is not recommended for production environments.
-{{- end }}
-
-PostgreSQL can be accessed via port {{ include "postgresql.v1.service.port" . }} on the following DNS names from within your cluster:
-
-    {{ include "postgresql.v1.primary.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read/Write connection
-
-{{- if eq .Values.architecture "replication" }}
-
-    {{ include "postgresql.v1.readReplica.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - Read only connection
-
-{{- end }}
-
-{{- if and (not (empty $customUser)) (ne $customUser "postgres") }}
-{{- if .Values.auth.enablePostgresUser }}
-
-To get the password for "postgres" run:
-
-    export POSTGRES_ADMIN_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.secretName" . }} -o jsonpath="{.data.{{include "postgresql.v1.adminPasswordKey" .}}}" | base64 -d)
-{{- end }}
-
-To get the password for "{{ $customUser }}" run:
-
-    export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.secretName" . }} -o jsonpath="{.data.{{include "postgresql.v1.userPasswordKey" .}}}" | base64 -d)
-{{- else }}
-{{- if .Values.auth.enablePostgresUser }}
-
-To get the password for "{{ default "postgres" $customUser }}" run:
-
-    export POSTGRES_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.secretName" . }} -o jsonpath="{.data.{{ ternary "password" (include "postgresql.v1.adminPasswordKey" .)  (and (not (empty $customUser)) (ne $customUser "postgres")) }}}" | base64 -d)
-{{- end }}
-{{- end }}
-
-To connect to your database run the following command:
-    {{- if $authEnabled }}
-
-    kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ include "postgresql.v1.image" . }} --env="PGPASSWORD=$POSTGRES_PASSWORD" \
-      --command -- psql --host {{ include "postgresql.v1.primary.fullname" . }} -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }}
-    {{- else }}
-
-    kubectl run {{ include "common.names.fullname" . }}-client --rm --tty -i --restart='Never' --namespace {{ .Release.Namespace }} --image {{ include "postgresql.v1.image" . }} \
-      --command -- psql --host {{ include "postgresql.v1.primary.fullname" . }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }}
-    {{- end }}
-
-    > NOTE: If you access the container using bash, make sure that you execute "/opt/bitnami/scripts/postgresql/entrypoint.sh /bin/bash" in order to avoid the error "psql: local user with ID {{ .Values.primary.containerSecurityContext.runAsUser }}} does not exist"
-
-To connect to your database from outside the cluster execute the following commands:
-
-{{- if contains "NodePort" .Values.primary.service.type }}
-
-    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "postgresql.v1.primary.fullname" . }})
-    {{- if $authEnabled }}
-    PGPASSWORD="$POSTGRES_PASSWORD" psql --host $NODE_IP --port $NODE_PORT -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }}
-    {{- else }}
-    psql --host $NODE_IP --port $NODE_PORT -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }}
-    {{- end }}
-{{- else if contains "LoadBalancer" .Values.primary.service.type }}
-
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ include "postgresql.v1.primary.fullname" . }}'
-
-    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "postgresql.v1.primary.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
-    {{- if $authEnabled }}
-    PGPASSWORD="$POSTGRES_PASSWORD" psql --host $SERVICE_IP --port {{ include "postgresql.v1.service.port" . }} -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }}
-    {{- else }}
-    psql --host $SERVICE_IP --port {{ include "postgresql.v1.service.port" . }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }}
-    {{- end }}
-{{- else if contains "ClusterIP" .Values.primary.service.type }}
-
-    kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ include "postgresql.v1.primary.fullname" . }} {{ include "postgresql.v1.service.port" . }}:{{ include "postgresql.v1.service.port" . }} &
-    {{- if $authEnabled }}
-    PGPASSWORD="$POSTGRES_PASSWORD" psql --host 127.0.0.1 -U {{ default "postgres" $customUser }} -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }}
-    {{- else }}
-    psql --host 127.0.0.1 -d {{- if include "postgresql.v1.database" . }} {{ include "postgresql.v1.database" . }}{{- else }} postgres{{- end }} -p {{ include "postgresql.v1.service.port" . }}
-    {{- end }}
-{{- end }}
-{{- end }}
-
-WARNING: The configured password will be ignored on new installation in case when previous PostgreSQL release was deleted through the helm command. In that case, old PVC will have an old password, and setting it through helm won't take effect. Deleting persistent volumes (PVs) will solve the issue.
-
-{{- include "postgresql.v1.validateValues" . -}}
-{{- include "common.warnings.rollingTag" .Values.image -}}
-{{- include "common.warnings.rollingTag" .Values.volumePermissions.image }}

charts/postgresql/templates/_helpers.tpl

@@ -1,406 +0,0 @@
-{{/*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{/* vim: set filetype=mustache: */}}
-
-{{/*
-Create a default fully qualified app name for PostgreSQL Primary objects
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "postgresql.v1.primary.fullname" -}}
-{{- if eq .Values.architecture "replication" -}}
-    {{- printf "%s-%s" (include "common.names.fullname" .) .Values.primary.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-    {{- include "common.names.fullname" . -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name for PostgreSQL read-only replicas objects
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "postgresql.v1.readReplica.fullname" -}}
-{{- printf "%s-%s" (include "common.names.fullname" .) .Values.readReplicas.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the default FQDN for PostgreSQL primary headless service
-We truncate at 63 chars because of the DNS naming spec.
-*/}}
-{{- define "postgresql.v1.primary.svc.headless" -}}
-{{- printf "%s-hl" (include "postgresql.v1.primary.fullname" .) | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the default FQDN for PostgreSQL read-only replicas headless service
-We truncate at 63 chars because of the DNS naming spec.
-*/}}
-{{- define "postgresql.v1.readReplica.svc.headless" -}}
-{{- printf "%s-hl" (include "postgresql.v1.readReplica.fullname" .) | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Return the proper PostgreSQL image name
-*/}}
-{{- define "postgresql.v1.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
-{{- end -}}
-
-{{/*
-Return the proper PostgreSQL metrics image name
-*/}}
-{{- define "postgresql.v1.metrics.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.metrics.image "global" .Values.global) }}
-{{- end -}}
-
-{{/*
-Return the proper image name (for the init container volume-permissions image)
-*/}}
-{{- define "postgresql.v1.volumePermissions.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.volumePermissions.image "global" .Values.global) }}
-{{- end -}}
-
-{{/*
-Return the proper Docker Image Registry Secret Names
-*/}}
-{{- define "postgresql.v1.imagePullSecrets" -}}
-{{ include "common.images.renderPullSecrets" (dict "images" (list .Values.image .Values.metrics.image .Values.volumePermissions.image) "context" $) }}
-{{- end -}}
-
-{{/*
-Return the name for a custom user to create
-*/}}
-{{- define "postgresql.v1.username" -}}
-{{- if .Values.global.postgresql.auth.username -}}
-    {{- .Values.global.postgresql.auth.username -}}
-{{- else -}}
-    {{- .Values.auth.username -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the name for a custom database to create
-*/}}
-{{- define "postgresql.v1.database" -}}
-{{- if .Values.global.postgresql.auth.database -}}
-    {{- printf "%s" (tpl .Values.global.postgresql.auth.database $) -}}
-{{- else if .Values.auth.database -}}
-    {{- printf "%s" (tpl .Values.auth.database $) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the password secret.
-*/}}
-{{- define "postgresql.v1.secretName" -}}
-{{- if .Values.global.postgresql.auth.existingSecret -}}
-    {{- printf "%s" (tpl .Values.global.postgresql.auth.existingSecret $) -}}
-{{- else if .Values.auth.existingSecret -}}
-    {{- printf "%s" (tpl .Values.auth.existingSecret $) -}}
-{{- else -}}
-    {{- printf "%s" (include "common.names.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the replication-password key.
-*/}}
-{{- define "postgresql.v1.replicationPasswordKey" -}}
-{{- if or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret -}}
-    {{- if .Values.global.postgresql.auth.secretKeys.replicationPasswordKey -}}
-        {{- printf "%s" (tpl .Values.global.postgresql.auth.secretKeys.replicationPasswordKey $) -}}
-    {{- else if .Values.auth.secretKeys.replicationPasswordKey -}}
-        {{- printf "%s" (tpl .Values.auth.secretKeys.replicationPasswordKey $) -}}
-    {{- else -}}
-        {{- "replication-password" -}}
-    {{- end -}}
-{{- else -}}
-    {{- "replication-password" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the admin-password key.
-*/}}
-{{- define "postgresql.v1.adminPasswordKey" -}}
-{{- if or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret -}}
-    {{- if .Values.global.postgresql.auth.secretKeys.adminPasswordKey -}}
-        {{- printf "%s" (tpl .Values.global.postgresql.auth.secretKeys.adminPasswordKey $) -}}
-    {{- else if .Values.auth.secretKeys.adminPasswordKey -}}
-        {{- printf "%s" (tpl .Values.auth.secretKeys.adminPasswordKey $) -}}
-    {{- end -}}
-{{- else -}}
-    {{- "postgres-password" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the user-password key.
-*/}}
-{{- define "postgresql.v1.userPasswordKey" -}}
-{{- if or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret -}}
-    {{- if or (empty (include "postgresql.v1.username" .)) (eq (include "postgresql.v1.username" .) "postgres") -}}
-        {{- printf "%s" (include "postgresql.v1.adminPasswordKey" .) -}}
-    {{- else -}}
-        {{- if .Values.global.postgresql.auth.secretKeys.userPasswordKey -}}
-            {{- printf "%s" (tpl .Values.global.postgresql.auth.secretKeys.userPasswordKey $) -}}
-        {{- else if .Values.auth.secretKeys.userPasswordKey -}}
-            {{- printf "%s" (tpl .Values.auth.secretKeys.userPasswordKey $) -}}
-        {{- end -}}
-    {{- end -}}
-{{- else -}}
-    {{- "password" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if a secret object should be created
-*/}}
-{{- define "postgresql.v1.createSecret" -}}
-{{- $customUser := include "postgresql.v1.username" . -}}
-{{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "common.names.fullname" .) "key" .Values.auth.secretKeys.adminPasswordKey "defaultValue" (ternary (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword .Values.global.postgresql.auth.password .Values.auth.password) (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (or (empty $customUser) (eq $customUser "postgres"))) "context" $) -}}
-{{- if and (not (or .Values.global.postgresql.auth.existingSecret .Values.auth.existingSecret)) (or $postgresPassword .Values.auth.enablePostgresUser (and (not (empty $customUser)) (ne $customUser "postgres")) (eq .Values.architecture "replication") (and .Values.ldap.enabled (or .Values.ldap.bind_password .Values.ldap.bindpw))) -}}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return PostgreSQL service port
-*/}}
-{{- define "postgresql.v1.service.port" -}}
-{{- if .Values.global.postgresql.service.ports.postgresql -}}
-    {{- .Values.global.postgresql.service.ports.postgresql -}}
-{{- else -}}
-    {{- .Values.primary.service.ports.postgresql -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return PostgreSQL service port
-*/}}
-{{- define "postgresql.v1.readReplica.service.port" -}}
-{{- if .Values.global.postgresql.service.ports.postgresql -}}
-    {{- .Values.global.postgresql.service.ports.postgresql -}}
-{{- else -}}
-    {{- .Values.readReplicas.service.ports.postgresql -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the PostgreSQL primary configuration ConfigMap name.
-*/}}
-{{- define "postgresql.v1.primary.configmapName" -}}
-{{- if .Values.primary.existingConfigmap -}}
-    {{- printf "%s" (tpl .Values.primary.existingConfigmap $) -}}
-{{- else -}}
-    {{- printf "%s-configuration" (include "postgresql.v1.primary.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if a configmap object should be created for PostgreSQL primary with the configuration
-*/}}
-{{- define "postgresql.v1.primary.createConfigmap" -}}
-{{- if and (or .Values.primary.configuration .Values.primary.pgHbaConfiguration) (not .Values.primary.existingConfigmap) -}}
-    {{- true -}}
-{{- else -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the PostgreSQL primary extended configuration ConfigMap name.
-*/}}
-{{- define "postgresql.v1.primary.extendedConfigmapName" -}}
-{{- if .Values.primary.existingExtendedConfigmap -}}
-    {{- printf "%s" (tpl .Values.primary.existingExtendedConfigmap $) -}}
-{{- else -}}
-    {{- printf "%s-extended-configuration" (include "postgresql.v1.primary.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the PostgreSQL read replica extended configuration ConfigMap name.
-*/}}
-{{- define "postgresql.v1.readReplicas.extendedConfigmapName" -}}
-    {{- printf "%s-extended-configuration" (include "postgresql.v1.readReplica.fullname" .) -}}
-{{- end -}}
-
-{{/*
-Return true if a configmap object should be created for PostgreSQL primary with the extended configuration
-*/}}
-{{- define "postgresql.v1.primary.createExtendedConfigmap" -}}
-{{- if and .Values.primary.extendedConfiguration (not .Values.primary.existingExtendedConfigmap) -}}
-    {{- true -}}
-{{- else -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if a configmap object should be created for PostgreSQL read replica with the extended configuration
-*/}}
-{{- define "postgresql.v1.readReplicas.createExtendedConfigmap" -}}
-{{- if .Values.readReplicas.extendedConfiguration -}}
-    {{- true -}}
-{{- else -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
- Create the name of the service account to use
- */}}
-{{- define "postgresql.v1.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if a configmap should be mounted with PostgreSQL configuration
-*/}}
-{{- define "postgresql.v1.mountConfigurationCM" -}}
-{{- if or .Values.primary.configuration .Values.primary.pgHbaConfiguration .Values.primary.existingConfigmap -}}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the initialization scripts ConfigMap name.
-*/}}
-{{- define "postgresql.v1.initdb.scriptsCM" -}}
-{{- if .Values.primary.initdb.scriptsConfigMap -}}
-    {{- printf "%s" (tpl .Values.primary.initdb.scriptsConfigMap $) -}}
-{{- else -}}
-    {{- printf "%s-init-scripts" (include "postgresql.v1.primary.fullname" .) -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if TLS is enabled for LDAP connection
-*/}}
-{{- define "postgresql.v1.ldap.tls.enabled" -}}
-{{- if and (kindIs "string" .Values.ldap.tls) (not (empty .Values.ldap.tls)) -}}
-    {{- true -}}
-{{- else if and (kindIs "map" .Values.ldap.tls) .Values.ldap.tls.enabled -}}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Get the readiness probe command
-*/}}
-{{- define "postgresql.v1.readinessProbeCommand" -}}
-{{- $customUser := include "postgresql.v1.username" . -}}
-- |
-{{- if (include "postgresql.v1.database" .) }}
-  exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if .Values.tls.enabled }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-{{- else }}
-  exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if .Values.tls.enabled }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-{{- end }}
-{{- if contains "bitnami/" .Values.image.repository }}
-  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
-{{- end }}
-{{- end -}}
-
-{{/*
-Compile all warnings into a single message, and call fail.
-*/}}
-{{- define "postgresql.v1.validateValues" -}}
-{{- $messages := list -}}
-{{- $messages := append $messages (include "postgresql.v1.validateValues.ldapConfigurationMethod" .) -}}
-{{- $messages := append $messages (include "postgresql.v1.validateValues.psp" .) -}}
-{{- $messages := without $messages "" -}}
-{{- $message := join "\n" $messages -}}
-
-{{- if $message -}}
-{{- printf "\nVALUES VALIDATION:\n%s" $message | fail -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Validate values of Postgresql - If ldap.url is used then you don't need the other settings for ldap
-*/}}
-{{- define "postgresql.v1.validateValues.ldapConfigurationMethod" -}}
-{{- if and .Values.ldap.enabled (and (not (empty .Values.ldap.url)) (not (empty .Values.ldap.server))) -}}
-postgresql: ldap.url, ldap.server
-    You cannot set both `ldap.url` and `ldap.server` at the same time.
-    Please provide a unique way to configure LDAP.
-    More info at https://www.postgresql.org/docs/current/auth-ldap.html
-{{- end -}}
-{{- end -}}
-
-{{/*
-Validate values of Postgresql - If PSP is enabled RBAC should be enabled too
-*/}}
-{{- define "postgresql.v1.validateValues.psp" -}}
-{{- if and .Values.psp.create (not .Values.rbac.create) -}}
-postgresql: psp.create, rbac.create
-    RBAC should be enabled if PSP is enabled in order for PSP to work.
-    More info at https://kubernetes.io/docs/concepts/policy/pod-security-policy/#authorizing-policies
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the path to the cert file.
-*/}}
-{{- define "postgresql.v1.tlsCert" -}}
-{{- if .Values.tls.autoGenerated -}}
-    {{- printf "/opt/bitnami/postgresql/certs/tls.crt" -}}
-{{- else -}}
-    {{- required "Certificate filename is required when TLS in enabled" .Values.tls.certFilename | printf "/opt/bitnami/postgresql/certs/%s" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the path to the cert key file.
-*/}}
-{{- define "postgresql.v1.tlsCertKey" -}}
-{{- if .Values.tls.autoGenerated -}}
-    {{- printf "/opt/bitnami/postgresql/certs/tls.key" -}}
-{{- else -}}
-{{- required "Certificate Key filename is required when TLS in enabled" .Values.tls.certKeyFilename | printf "/opt/bitnami/postgresql/certs/%s" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the path to the CA cert file.
-*/}}
-{{- define "postgresql.v1.tlsCACert" -}}
-{{- if .Values.tls.autoGenerated -}}
-    {{- printf "/opt/bitnami/postgresql/certs/ca.crt" -}}
-{{- else -}}
-    {{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.certCAFilename -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the path to the CRL file.
-*/}}
-{{- define "postgresql.v1.tlsCRL" -}}
-{{- if .Values.tls.crlFilename -}}
-{{- printf "/opt/bitnami/postgresql/certs/%s" .Values.tls.crlFilename -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return true if a TLS credentials secret object should be created
-*/}}
-{{- define "postgresql.v1.createTlsSecret" -}}
-{{- if and .Values.tls.autoGenerated (not .Values.tls.certificatesSecret) -}}
-    {{- true -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the path to the CA cert file.
-*/}}
-{{- define "postgresql.v1.tlsSecretName" -}}
-{{- if .Values.tls.autoGenerated -}}
-    {{- printf "%s-crt" (include "common.names.fullname" .) -}}
-{{- else -}}
-    {{ required "A secret containing TLS certificates is required when TLS is enabled" .Values.tls.certificatesSecret }}
-{{- end -}}
-{{- end -}}

charts/postgresql/templates/backup/cronjob.yaml

@@ -1,114 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.backup.enabled }}
-{{- $customUser := include "postgresql.v1.username" . }}
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall
-  namespace: {{ .Release.Namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: pg_dumpall
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.annotations .Values.commonAnnotations ) "context" . ) }}
-  {{- if $annotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  schedule: {{ quote .Values.backup.cronjob.schedule }}
-  {{- if .Values.backup.cronjob.timezone }}
-  timeZone: {{ .Values.backup.cronjob.timezone | quote }}
-  {{- end }}
-  concurrencyPolicy: {{ .Values.backup.cronjob.concurrencyPolicy }}
-  failedJobsHistoryLimit: {{ .Values.backup.cronjob.failedJobsHistoryLimit }}
-  successfulJobsHistoryLimit: {{ .Values.backup.cronjob.successfulJobsHistoryLimit }}
-  {{- if .Values.backup.cronjob.startingDeadlineSeconds }}
-  startingDeadlineSeconds: {{ .Values.backup.cronjob.startingDeadlineSeconds }}
-  {{- end }}
-  jobTemplate:
-    spec:
-      {{- if .Values.backup.cronjob.ttlSecondsAfterFinished }}
-      ttlSecondsAfterFinished: {{ .Values.backup.cronjob.ttlSecondsAfterFinished }}
-      {{- end }}
-      template:
-        metadata:
-          labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 12 }}
-            app.kubernetes.io/component: pg_dumpall
-          {{- if $annotations }}
-          annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 12 }}
-          {{- end }}
-        spec:
-          {{- include "postgresql.v1.imagePullSecrets" . | nindent 10 }}
-          {{- if .Values.backup.cronjob.nodeSelector }}
-          nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.backup.cronjob.nodeSelector "context" $) | nindent 12 }}
-          {{- end }}
-          containers:
-          - name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall
-            image: {{ include "postgresql.v1.image" . }}
-            imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-            env:
-              - name: PGUSER
-              {{- if .Values.auth.enablePostgresUser }}
-                value: postgres
-              {{- else }}
-                value: {{ $customUser | quote }}
-              {{- end }}
-              {{- if .Values.auth.usePasswordFiles }}
-              - name:  PGPASSFILE
-                value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }}
-              {{- else }}
-              - name: PGPASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ include "postgresql.v1.secretName" . }}
-                    key: {{ include "postgresql.v1.adminPasswordKey" . }}
-              {{- end }}
-              - name: PGHOST
-                value: {{ include "postgresql.v1.primary.fullname" . }}
-              - name: PGPORT
-                value: {{ include "postgresql.v1.service.port" . | quote }}
-              - name: PGDUMP_DIR
-                value: {{ .Values.backup.cronjob.storage.mountPath }}
-              {{- if .Values.tls.enabled }}
-              - name:  PGSSLROOTCERT
-                {{- if .Values.tls.autoGenerated }}
-                value: /tmp/certs/ca.crt
-                {{- else }}
-                value: {{- printf "/tmp/certs/%s" .Values.tls.certCAFilename -}}
-                {{- end }}
-              {{- end }}
-            command: {{- include "common.tplvalues.render" (dict "value" .Values.backup.cronjob.command "context" $) | nindent 14 }}
-            volumeMounts:
-              {{- if .Values.tls.enabled }}
-              - name: certs
-                mountPath: /certs
-              {{- end }}
-              - name: datadir
-                mountPath: {{ .Values.backup.cronjob.storage.mountPath }}
-                subPath: {{ .Values.backup.cronjob.storage.subPath }}
-            {{- if .Values.backup.cronjob.containerSecurityContext.enabled }}
-            securityContext: {{- omit .Values.backup.cronjob.containerSecurityContext "enabled" | toYaml | nindent 14 }}
-            {{- end }}
-          restartPolicy: {{ .Values.backup.cronjob.restartPolicy }}
-          {{- if .Values.backup.cronjob.podSecurityContext.enabled }}
-          securityContext:
-            fsGroup: {{ .Values.backup.cronjob.podSecurityContext.fsGroup }}
-          {{- end }}
-          volumes:
-            {{- if .Values.tls.enabled }}
-            - name: raw-certificates
-              emptyDir: /tmp/certs
-            {{- end }}
-            {{- if .Values.backup.cronjob.storage.existingClaim }}
-            - name: datadir
-              persistentVolumeClaim:
-                claimName: {{ printf "%s" (tpl .Values.backup.cronjob.storage.existingClaim .) }}
-            {{- else }}
-            - name: datadir
-              persistentVolumeClaim:
-                claimName: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall
-            {{- end }}
-{{- end }}

charts/postgresql/templates/backup/pvc.yaml

@@ -1,34 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.backup.enabled (not .Values.backup.cronjob.storage.existingClaim) -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "postgresql.v1.primary.fullname" . }}-pgdumpall
-  namespace: {{ .Release.Namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: pg_dumpall
-  {{- if or .Values.backup.cronjob.annotations .Values.commonAnnotations .Values.backup.cronjob.storage.resourcePolicy }}
-  annotations:
-    {{- if or .Values.backup.cronjob.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.backup.cronjob.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    {{- if .Values.backup.cronjob.storage.resourcePolicy }}
-    helm.sh/resource-policy: {{ .Values.backup.cronjob.storage.resourcePolicy | quote }}
-    {{- end }}
-  {{- end }}
-spec:
-  accessModes:
-  {{- range .Values.backup.cronjob.storage.accessModes }}
-    - {{ . | quote }}
-  {{- end }}
-  resources:
-    requests:
-      storage: {{ .Values.backup.cronjob.storage.size | quote }}
-  {{ include "common.storage.class" (dict "persistence" .Values.backup.cronjob.storage "global" .Values.global) }}
-{{- end }}

charts/postgresql/templates/extra-list.yaml

@@ -1,9 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- range .Values.extraDeploy }}
----
-{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
-{{- end }}

charts/postgresql/templates/primary/configmap.yaml

@@ -1,26 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if (include "postgresql.v1.primary.createConfigmap" .) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-configuration" (include "postgresql.v1.primary.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  {{- if .Values.primary.configuration }}
-  postgresql.conf: |
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.configuration "context" $ ) | nindent 4 }}
-  {{- end }}
-  {{- if .Values.primary.pgHbaConfiguration }}
-  pg_hba.conf: |
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.pgHbaConfiguration "context" $ ) | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/postgresql/templates/primary/extended-configmap.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if (include "postgresql.v1.primary.createExtendedConfigmap" .) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-extended-configuration" (include "postgresql.v1.primary.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  override.conf: |-
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.extendedConfiguration "context" $ ) | nindent 4 }}
-{{- end }}

charts/postgresql/templates/primary/initialization-configmap.yaml

@@ -1,17 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.primary.initdb.scripts (not .Values.primary.initdb.scriptsConfigMap) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-init-scripts" (include "postgresql.v1.primary.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data: {{- include "common.tplvalues.render" (dict "value" .Values.primary.initdb.scripts "context" .) | nindent 2 }}
-{{- end }}

charts/postgresql/templates/primary/metrics-configmap.yaml

@@ -1,18 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-metrics" (include "postgresql.v1.primary.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
-{{- end }}

charts/postgresql/templates/primary/metrics-svc.yaml

@@ -1,31 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.metrics.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ printf "%s-metrics" (include "postgresql.v1.primary.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: metrics
-  {{- if or .Values.commonAnnotations .Values.metrics.service.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.service.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  type: ClusterIP
-  sessionAffinity: {{ .Values.metrics.service.sessionAffinity }}
-  {{- if .Values.metrics.service.clusterIP }}
-  clusterIP: {{ .Values.metrics.service.clusterIP }}
-  {{- end }}
-  ports:
-    - name: http-metrics
-      port: {{ .Values.metrics.service.ports.metrics }}
-      targetPort: http-metrics
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-{{- end }}

charts/postgresql/templates/primary/networkpolicy.yaml

@@ -1,79 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.primary.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-metadata:
-  name: {{ include "postgresql.v1.primary.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }}
-  podSelector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: primary
-  policyTypes:
-    - Ingress
-    - Egress
-  {{- if .Values.networkPolicy.allowExternalEgress }}
-  egress:
-    - {}
-  {{- else }}
-  egress:
-    # Allow dns resolution
-    - ports:
-        - port: 53
-          protocol: UDP
-        - port: 53
-          protocol: TCP
-    # Allow outbound connections to read-replicas
-    - ports:
-        - port: {{ include "postgresql.v1.readReplica.service.port" . }}
-        - port: {{ .Values.containerPorts.postgresql }}
-      to:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 14 }}
-              app.kubernetes.io/component: read
-    {{- if .Values.primary.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-  ingress:
-    - ports:
-        - port: {{ .Values.containerPorts.postgresql }}
-        {{- if .Values.metrics.enabled }}
-        - port: {{ .Values.metrics.containerPorts.metrics }}
-        {{- end }}
-      {{- if not .Values.primary.networkPolicy.allowExternal }}
-      from:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 14 }}
-        - podSelector:
-            matchLabels:
-              {{ template "postgresql.v1.primary.fullname" . }}-client: "true"
-        {{- if .Values.primary.networkPolicy.ingressNSMatchLabels }}
-        - namespaceSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.primary.networkPolicy.ingressNSMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- if .Values.primary.networkPolicy.ingressNSPodMatchLabels }}
-          podSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.primary.networkPolicy.ingressNSPodMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- end }}
-        {{- end }}
-      {{- end }}
-    {{- if .Values.primary.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
-    {{- end }}
-{{- end }}

charts/postgresql/templates/primary/servicemonitor.yaml

@@ -1,46 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "postgresql.v1.primary.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: metrics
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    {{- $svcLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.selector .Values.commonLabels ) "context" . ) }}
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $svcLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: metrics
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.relabelings "context" $) | nindent 6 }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.metricRelabelings "context" $) | nindent 6 }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace | quote }}
-{{- end }}

charts/postgresql/templates/primary/statefulset.yaml

@@ -1,662 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- $customUser := include "postgresql.v1.username" . }}
-apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
-kind: StatefulSet
-metadata:
-  name: {{ include "postgresql.v1.primary.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-  {{- if or .Values.commonAnnotations .Values.primary.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  replicas: 1
-  serviceName: {{ include "postgresql.v1.primary.svc.headless" . }}
-  {{- if .Values.primary.updateStrategy }}
-  updateStrategy: {{- toYaml .Values.primary.updateStrategy | nindent 4 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: primary
-  template:
-    metadata:
-      name: {{ include "postgresql.v1.primary.fullname" . }}
-      labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
-        app.kubernetes.io/component: primary
-      {{- if or (include "postgresql.v1.primary.createConfigmap" .) (include "postgresql.v1.primary.createExtendedConfigmap" .) .Values.primary.podAnnotations }}
-      annotations:
-        {{- if (include "postgresql.v1.primary.createConfigmap" .) }}
-        checksum/configuration: {{ pick (include (print $.Template.BasePath "/primary/configmap.yaml") . | fromYaml) "data" | toYaml | sha256sum }}
-        {{- end }}
-        {{- if (include "postgresql.v1.primary.createExtendedConfigmap" .) }}
-        checksum/extended-configuration: {{ pick (include (print $.Template.BasePath "/primary/extended-configmap.yaml") . | fromYaml) "data" | toYaml | sha256sum }}
-        {{- end }}
-        {{- if .Values.primary.podAnnotations }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.primary.podAnnotations "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- end }}
-    spec:
-      {{- if .Values.primary.extraPodSpec }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraPodSpec "context" $) | nindent 6 }}
-      {{- end }}
-      serviceAccountName: {{ include "postgresql.v1.serviceAccountName" . }}
-      {{- include "postgresql.v1.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.primary.automountServiceAccountToken }}
-      {{- if .Values.primary.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.primary.hostAliases "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.primary.affinity }}
-      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.primary.affinity "context" $) | nindent 8 }}
-      {{- else }}
-      affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAffinityPreset "component" "primary" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.primary.podAntiAffinityPreset "component" "primary" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.primary.nodeAffinityPreset.type "key" .Values.primary.nodeAffinityPreset.key "values" .Values.primary.nodeAffinityPreset.values) | nindent 10 }}
-      {{- end }}
-      {{- if .Values.primary.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.primary.nodeSelector "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.primary.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.tolerations "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.primary.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.primary.topologySpreadConstraints "context" .) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.primary.priorityClassName }}
-      priorityClassName: {{ .Values.primary.priorityClassName }}
-      {{- end }}
-      {{- if .Values.primary.schedulerName }}
-      schedulerName: {{ .Values.primary.schedulerName | quote }}
-      {{- end }}
-      {{- if .Values.primary.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ .Values.primary.terminationGracePeriodSeconds }}
-      {{- end }}
-      {{- if .Values.primary.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.primary.podSecurityContext "enabled" | toYaml | nindent 8 }}
-      {{- end }}
-      hostNetwork: {{ .Values.primary.hostNetwork }}
-      hostIPC: {{ .Values.primary.hostIPC }}
-      {{- if or (and .Values.tls.enabled (not .Values.volumePermissions.enabled)) (and .Values.volumePermissions.enabled (or .Values.primary.persistence.enabled .Values.shmVolume.enabled)) .Values.primary.initContainers }}
-      initContainers:
-        {{- if and .Values.tls.enabled (not .Values.volumePermissions.enabled) }}
-        - name: copy-certs
-          image: {{ include "postgresql.v1.volumePermissions.image" . }}
-          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
-          {{- if .Values.primary.resources }}
-          resources: {{- toYaml .Values.primary.resources | nindent 12 }}
-          {{- end }}
-          # We don't require a privileged container in this case
-          {{- if .Values.primary.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.primary.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
-              chmod 600 {{ include "postgresql.v1.tlsCertKey" . }}
-          volumeMounts:
-            - name: raw-certificates
-              mountPath: /tmp/certs
-            - name: postgresql-certificates
-              mountPath: /opt/bitnami/postgresql/certs
-        {{- else if and .Values.volumePermissions.enabled (or .Values.primary.persistence.enabled .Values.shmVolume.enabled) }}
-        - name: init-chmod-data
-          image: {{ include "postgresql.v1.volumePermissions.image" . }}
-          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
-          {{- if .Values.volumePermissions.resources }}
-          resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
-          {{- end }}
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              {{- if .Values.primary.persistence.enabled }}
-              {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-              chown `id -u`:`id -G | cut -d " " -f2` {{ .Values.primary.persistence.mountPath }}
-              {{- else }}
-              chown {{ .Values.primary.containerSecurityContext.runAsUser }}:{{ .Values.primary.podSecurityContext.fsGroup }} {{ .Values.primary.persistence.mountPath }}
-              {{- end }}
-              mkdir -p {{ .Values.primary.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.primary.persistence.mountPath }}/conf {{- end }}
-              chmod 700 {{ .Values.primary.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.primary.persistence.mountPath }}/conf {{- end }}
-              find {{ .Values.primary.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.v1.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \
-              {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-                xargs -r chown -R `id -u`:`id -G | cut -d " " -f2`
-              {{- else }}
-                xargs -r chown -R {{ .Values.primary.containerSecurityContext.runAsUser }}:{{ .Values.primary.podSecurityContext.fsGroup }}
-              {{- end }}
-              {{- end }}
-              {{- if .Values.shmVolume.enabled }}
-              chmod -R 777 /dev/shm
-              {{- end }}
-              {{- if .Values.tls.enabled }}
-              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
-              {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-              chown -R `id -u`:`id -G | cut -d " " -f2` /opt/bitnami/postgresql/certs/
-              {{- else }}
-              chown -R {{ .Values.primary.containerSecurityContext.runAsUser }}:{{ .Values.primary.podSecurityContext.fsGroup }} /opt/bitnami/postgresql/certs/
-              {{- end }}
-              chmod 600 {{ include "postgresql.v1.tlsCertKey" . }}
-              {{- end }}
-          {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-          securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }}
-          {{- else }}
-          securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.primary.persistence.enabled }}
-            - name: data
-              mountPath: {{ .Values.primary.persistence.mountPath }}
-              {{- if .Values.primary.persistence.subPath }}
-              subPath: {{ .Values.primary.persistence.subPath }}
-              {{- end }}
-            {{- end }}
-            {{- if .Values.shmVolume.enabled }}
-            - name: dshm
-              mountPath: /dev/shm
-            {{- end }}
-            {{- if .Values.tls.enabled }}
-            - name: raw-certificates
-              mountPath: /tmp/certs
-            - name: postgresql-certificates
-              mountPath: /opt/bitnami/postgresql/certs
-            {{- end }}
-        {{- end }}
-        {{- if .Values.primary.initContainers }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.primary.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- end }}
-      containers:
-        - name: postgresql
-          image: {{ include "postgresql.v1.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-          {{- if .Values.primary.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.primary.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.primary.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.primary.command "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.primary.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.primary.args "context" $) | nindent 12 }}
-          {{- end }}
-          env:
-            - name: BITNAMI_DEBUG
-              value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }}
-            - name: POSTGRESQL_PORT_NUMBER
-              value: {{ .Values.containerPorts.postgresql | quote }}
-            - name: POSTGRESQL_VOLUME_DIR
-              value: {{ .Values.primary.persistence.mountPath | quote }}
-            {{- if .Values.primary.persistence.mountPath }}
-            - name: PGDATA
-              value: {{ .Values.postgresqlDataDir | quote }}
-            {{- end }}
-            # Authentication
-            {{- if or (eq $customUser "postgres") (empty $customUser) }}
-            {{- if .Values.auth.enablePostgresUser }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.adminPasswordKey" . }}
-            {{- end }}
-            {{- else }}
-            - name: ALLOW_EMPTY_PASSWORD
-              value: "true"
-            {{- end }}
-            {{- else }}
-            - name: POSTGRES_USER
-              value: {{ $customUser | quote }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.userPasswordKey" . }}
-            {{- end }}
-            {{- if .Values.auth.enablePostgresUser }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_POSTGRES_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.adminPasswordKey" . }}
-            {{- end }}
-            {{- end }}
-            {{- end }}
-            {{- if (include "postgresql.v1.database" .) }}
-            - name: POSTGRES_DATABASE
-              value: {{ (include "postgresql.v1.database" .) | quote }}
-            {{- end }}
-            # Replication
-            {{- if or (eq .Values.architecture "replication") .Values.primary.standby.enabled }}
-            - name: POSTGRES_REPLICATION_MODE
-              value: {{ ternary "slave" "master" .Values.primary.standby.enabled | quote }}
-            - name: POSTGRES_REPLICATION_USER
-              value: {{ .Values.auth.replicationUsername | quote }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_REPLICATION_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.replicationPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_REPLICATION_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.replicationPasswordKey" . }}
-            {{- end }}
-            {{- if ne .Values.replication.synchronousCommit "off" }}
-            - name: POSTGRES_SYNCHRONOUS_COMMIT_MODE
-              value: {{ .Values.replication.synchronousCommit | quote }}
-            - name: POSTGRES_NUM_SYNCHRONOUS_REPLICAS
-              value: {{ .Values.replication.numSynchronousReplicas | quote }}
-            {{- end }}
-            - name: POSTGRES_CLUSTER_APP_NAME
-              value: {{ .Values.replication.applicationName }}
-            {{- end }}
-            # Initdb
-            {{- if .Values.primary.initdb.args }}
-            - name: POSTGRES_INITDB_ARGS
-              value: {{ .Values.primary.initdb.args | quote }}
-            {{- end }}
-            {{- if .Values.primary.initdb.postgresqlWalDir }}
-            - name: POSTGRES_INITDB_WALDIR
-              value: {{ .Values.primary.initdb.postgresqlWalDir | quote }}
-            {{- end }}
-            {{- if .Values.primary.initdb.user }}
-            - name: POSTGRES_INITSCRIPTS_USERNAME
-              value: {{ .Values.primary.initdb.user }}
-            {{- end }}
-            {{- if .Values.primary.initdb.password }}
-            - name: POSTGRES_INITSCRIPTS_PASSWORD
-              value: {{ .Values.primary.initdb.password | quote }}
-            {{- end }}
-            # Standby
-            {{- if .Values.primary.standby.enabled }}
-            - name: POSTGRES_MASTER_HOST
-              value: {{ .Values.primary.standby.primaryHost }}
-            - name: POSTGRES_MASTER_PORT_NUMBER
-              value: {{ .Values.primary.standby.primaryPort | quote }}
-            {{- end }}
-            # LDAP
-            - name: POSTGRESQL_ENABLE_LDAP
-              value: {{ ternary "yes" "no" .Values.ldap.enabled | quote }}
-            {{- if .Values.ldap.enabled }}
-            {{- if or .Values.ldap.url .Values.ldap.uri }}
-            - name: POSTGRESQL_LDAP_URL
-              value: {{ coalesce .Values.ldap.url .Values.ldap.uri }}
-            {{- else }}
-            - name: POSTGRESQL_LDAP_SERVER
-              value: {{ .Values.ldap.server }}
-            - name: POSTGRESQL_LDAP_PORT
-              value: {{ .Values.ldap.port | quote }}
-            - name: POSTGRESQL_LDAP_SCHEME
-              value: {{ .Values.ldap.scheme }}
-            {{- if (include "postgresql.v1.ldap.tls.enabled" .) }}
-            - name: POSTGRESQL_LDAP_TLS
-              value: "1"
-            {{- end }}
-            - name: POSTGRESQL_LDAP_PREFIX
-              value: {{ .Values.ldap.prefix | quote }}
-            - name: POSTGRESQL_LDAP_SUFFIX
-              value: {{ .Values.ldap.suffix | quote }}
-            - name: POSTGRESQL_LDAP_BASE_DN
-              value: {{ coalesce .Values.ldap.baseDN .Values.ldap.basedn }}
-            - name: POSTGRESQL_LDAP_BIND_DN
-              value: {{ coalesce .Values.ldap.bindDN .Values.ldap.binddn}}
-            {{- if or  (not (empty .Values.ldap.bind_password)) (not (empty .Values.ldap.bindpw)) }}
-            - name: POSTGRESQL_LDAP_BIND_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: ldap-password
-            {{- end }}
-            - name: POSTGRESQL_LDAP_SEARCH_ATTR
-              value: {{ coalesce .Values.ldap.search_attr .Values.ldap.searchAttribute }}
-            - name: POSTGRESQL_LDAP_SEARCH_FILTER
-              value: {{ coalesce .Values.ldap.search_filter .Values.ldap.searchFilter }}
-            {{- end }}
-            {{- end }}
-            # TLS
-            - name: POSTGRESQL_ENABLE_TLS
-              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
-            {{- if .Values.tls.enabled }}
-            - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS
-              value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }}
-            - name: POSTGRESQL_TLS_CERT_FILE
-              value: {{ include "postgresql.v1.tlsCert" . }}
-            - name: POSTGRESQL_TLS_KEY_FILE
-              value: {{ include "postgresql.v1.tlsCertKey" . }}
-            {{- if .Values.tls.certCAFilename }}
-            - name: POSTGRESQL_TLS_CA_FILE
-              value: {{ include "postgresql.v1.tlsCACert" . }}
-            {{- end }}
-            {{- if .Values.tls.crlFilename }}
-            - name: POSTGRESQL_TLS_CRL_FILE
-              value: {{ include "postgresql.v1.tlsCRL" . }}
-            {{- end }}
-            {{- end }}
-            # Audit
-            - name: POSTGRESQL_LOG_HOSTNAME
-              value: {{ .Values.audit.logHostname | quote }}
-            - name: POSTGRESQL_LOG_CONNECTIONS
-              value: {{ .Values.audit.logConnections | quote }}
-            - name: POSTGRESQL_LOG_DISCONNECTIONS
-              value: {{ .Values.audit.logDisconnections | quote }}
-            {{- if .Values.audit.logLinePrefix }}
-            - name: POSTGRESQL_LOG_LINE_PREFIX
-              value: {{ .Values.audit.logLinePrefix | quote }}
-            {{- end }}
-            {{- if .Values.audit.logTimezone }}
-            - name: POSTGRESQL_LOG_TIMEZONE
-              value: {{ .Values.audit.logTimezone | quote }}
-            {{- end }}
-            {{- if .Values.audit.pgAuditLog }}
-            - name: POSTGRESQL_PGAUDIT_LOG
-              value: {{ .Values.audit.pgAuditLog | quote }}
-            {{- end }}
-            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
-              value: {{ .Values.audit.pgAuditLogCatalog | quote }}
-            # Others
-            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
-              value: {{ .Values.audit.clientMinMessages | quote }}
-            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
-              value: {{ .Values.postgresqlSharedPreloadLibraries | quote }}
-            {{- if .Values.primary.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.primary.extraEnvVarsCM .Values.primary.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.primary.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ .Values.primary.extraEnvVarsCM }}
-            {{- end }}
-            {{- if .Values.primary.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ .Values.primary.extraEnvVarsSecret }}
-            {{- end }}
-          {{- end }}
-          ports:
-            - name: tcp-postgresql
-              containerPort: {{ .Values.containerPorts.postgresql }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.primary.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.primary.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.primary.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.primary.startupProbe "enabled") "context" $) | nindent 12 }}
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                {{- if (include "postgresql.v1.database" .) }}
-                - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- else }}
-                - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- end }}
-          {{- end }}
-          {{- if .Values.primary.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.primary.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.primary.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.primary.livenessProbe "enabled") "context" $) | nindent 12 }}
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                {{- if (include "postgresql.v1.database" .) }}
-                - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- else }}
-                - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- end }}
-          {{- end }}
-          {{- if .Values.primary.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.primary.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.primary.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.primary.readinessProbe "enabled") "context" $) | nindent 12 }}
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - -e
-                {{- include "postgresql.v1.readinessProbeCommand" . | nindent 16 }}
-          {{- end }}
-          {{- end }}
-          {{- if .Values.primary.resources }}
-          resources: {{- toYaml .Values.primary.resources | nindent 12 }}
-          {{- end }}
-          {{- if .Values.primary.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.primary.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            {{- if or .Values.primary.initdb.scriptsConfigMap .Values.primary.initdb.scripts }}
-            - name: custom-init-scripts
-              mountPath: /docker-entrypoint-initdb.d/
-            {{- end }}
-            {{- if .Values.primary.initdb.scriptsSecret }}
-            - name: custom-init-scripts-secret
-              mountPath: /docker-entrypoint-initdb.d/secret
-            {{- end }}
-            {{- if or .Values.primary.extendedConfiguration .Values.primary.existingExtendedConfigmap }}
-            - name: postgresql-extended-config
-              mountPath: {{ .Values.primary.persistence.mountPath }}/conf/conf.d/
-            {{- end }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: postgresql-password
-              mountPath: /opt/bitnami/postgresql/secrets/
-            {{- end }}
-            {{- if .Values.tls.enabled }}
-            - name: postgresql-certificates
-              mountPath: /opt/bitnami/postgresql/certs
-              readOnly: true
-            {{- end }}
-            {{- if .Values.shmVolume.enabled }}
-            - name: dshm
-              mountPath: /dev/shm
-            {{- end }}
-            {{- if .Values.primary.persistence.enabled }}
-            - name: data
-              mountPath: {{ .Values.primary.persistence.mountPath }}
-              {{- if .Values.primary.persistence.subPath }}
-              subPath: {{ .Values.primary.persistence.subPath }}
-              {{- end }}
-            {{- end }}
-            {{- if or .Values.primary.configuration .Values.primary.pgHbaConfiguration .Values.primary.existingConfigmap }}
-            - name: postgresql-config
-              mountPath: {{ .Values.primary.persistence.mountPath }}/conf
-            {{- end }}
-            {{- if .Values.primary.extraVolumeMounts }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.primary.extraVolumeMounts "context" $) | nindent 12 }}
-            {{- end }}
-        {{- if .Values.metrics.enabled }}
-        - name: metrics
-          image: {{ include "postgresql.v1.metrics.image" . }}
-          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
-          {{- if .Values.metrics.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if or .Values.metrics.customMetrics .Values.metrics.collectors }}
-          args:
-            {{- if .Values.metrics.customMetrics }}
-            - --extend.query-path
-            - /conf/custom-metrics.yaml
-            {{- end }}
-            {{- range $name, $enabled := .Values.metrics.collectors }}
-            - --{{ if not $enabled }}no-{{ end }}collector.{{ $name }}
-            {{- end }}
-          {{- end }}
-          env:
-            {{- $database := required "In order to enable metrics you need to specify a database (.Values.auth.database or .Values.global.postgresql.auth.database)" (include "postgresql.v1.database" .) }}
-            - name: DATA_SOURCE_URI
-              value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.v1.service.port" .)) $database }}
-            {{- $pwdKey := ternary (include "postgresql.v1.adminPasswordKey" .) (include "postgresql.v1.userPasswordKey" .) (or (eq $customUser "postgres") (empty $customUser)) }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: DATA_SOURCE_PASS_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" $pwdKey }}
-            {{- else }}
-            - name: DATA_SOURCE_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ $pwdKey }}
-            {{- end }}
-            - name: DATA_SOURCE_USER
-              value: {{ default "postgres" $customUser | quote }}
-            {{- if .Values.metrics.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          ports:
-            - name: http-metrics
-              containerPort: {{ .Values.metrics.containerPorts.metrics }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.metrics.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.metrics.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.metrics.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: http-metrics
-          {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: postgresql-password
-              mountPath: /opt/bitnami/postgresql/secrets/
-            {{- end }}
-            {{- if .Values.metrics.customMetrics }}
-            - name: custom-metrics
-              mountPath: /conf
-              readOnly: true
-            {{- end }}
-          {{- if .Values.metrics.resources }}
-          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
-          {{- end }}
-        {{- end }}
-        {{- if .Values.primary.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.primary.sidecars "context" $ ) | nindent 8 }}
-        {{- end }}
-      volumes:
-        {{- if or .Values.primary.configuration .Values.primary.pgHbaConfiguration .Values.primary.existingConfigmap }}
-        - name: postgresql-config
-          configMap:
-            name: {{ include "postgresql.v1.primary.configmapName" . }}
-        {{- end }}
-        {{- if or .Values.primary.extendedConfiguration .Values.primary.existingExtendedConfigmap }}
-        - name: postgresql-extended-config
-          configMap:
-            name: {{ include "postgresql.v1.primary.extendedConfigmapName" . }}
-        {{- end }}
-        {{- if .Values.auth.usePasswordFiles }}
-        - name: postgresql-password
-          secret:
-            secretName: {{ include "postgresql.v1.secretName" . }}
-        {{- end }}
-        {{- if or .Values.primary.initdb.scriptsConfigMap .Values.primary.initdb.scripts }}
-        - name: custom-init-scripts
-          configMap:
-            name: {{ include "postgresql.v1.initdb.scriptsCM" . }}
-        {{- end }}
-        {{- if .Values.primary.initdb.scriptsSecret }}
-        - name: custom-init-scripts-secret
-          secret:
-            secretName: {{ tpl .Values.primary.initdb.scriptsSecret $ }}
-        {{- end }}
-        {{- if  .Values.tls.enabled }}
-        - name: raw-certificates
-          secret:
-            secretName: {{ include "postgresql.v1.tlsSecretName" . }}
-        - name: postgresql-certificates
-          emptyDir: {}
-        {{- end }}
-        {{- if .Values.primary.extraVolumes }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.primary.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-        {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
-        - name: custom-metrics
-          configMap:
-            name: {{ printf "%s-metrics" (include "postgresql.v1.primary.fullname" .) }}
-        {{- end }}
-        {{- if .Values.shmVolume.enabled }}
-        - name: dshm
-          emptyDir:
-            medium: Memory
-            {{- if .Values.shmVolume.sizeLimit }}
-            sizeLimit: {{ .Values.shmVolume.sizeLimit }}
-            {{- end }}
-        {{- end }}
-  {{- if and .Values.primary.persistence.enabled .Values.primary.persistence.existingClaim }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ tpl .Values.primary.persistence.existingClaim $ }}
-  {{- else if not .Values.primary.persistence.enabled }}
-        - name: data
-          emptyDir: {}
-  {{- else }}
-  {{- if .Values.primary.persistentVolumeClaimRetentionPolicy.enabled }}
-  persistentVolumeClaimRetentionPolicy:
-    whenDeleted: {{ .Values.primary.persistentVolumeClaimRetentionPolicy.whenDeleted }}
-    whenScaled: {{ .Values.primary.persistentVolumeClaimRetentionPolicy.whenScaled }}
-  {{- end }}
-  volumeClaimTemplates:
-    - apiVersion: v1
-      kind: PersistentVolumeClaim
-      metadata:
-        name: data
-        {{- if .Values.primary.persistence.annotations }}
-        annotations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.persistence.annotations "context" $) | nindent 10 }}
-        {{- end }}
-        {{- if .Values.primary.persistence.labels }}
-        labels: {{- include "common.tplvalues.render" (dict "value" .Values.primary.persistence.labels "context" $) | nindent 10 }}
-        {{- end }}
-      spec:
-        accessModes:
-        {{- range .Values.primary.persistence.accessModes }}
-          - {{ . | quote }}
-        {{- end }}
-        {{- if .Values.primary.persistence.dataSource }}
-        dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.primary.persistence.dataSource "context" $) | nindent 10 }}
-        {{- end }}
-        resources:
-          requests:
-            storage: {{ .Values.primary.persistence.size | quote }}
-        {{- if .Values.primary.persistence.selector }}
-        selector: {{- include "common.tplvalues.render" (dict "value" .Values.primary.persistence.selector "context" $) | nindent 10 }}
-        {{- end }}
-        {{- include "common.storage.class" (dict "persistence" .Values.primary.persistence "global" .Values.global) | nindent 8 }}
-  {{- end }}

charts/postgresql/templates/primary/svc-headless.yaml

@@ -1,36 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "postgresql.v1.primary.svc.headless" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-  annotations:
-    {{- if or .Values.primary.service.headless.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.service.headless.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    # Use this annotation in addition to the actual publishNotReadyAddresses
-    # field below because the annotation will stop being respected soon but the
-    # field is broken in some versions of Kubernetes:
-    # https://github.com/kubernetes/kubernetes/issues/58662
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-spec:
-  type: ClusterIP
-  clusterIP: None
-  # We want all pods in the StatefulSet to have their addresses published for
-  # the sake of the other Postgresql pods even before they're ready, since they
-  # have to be able to talk to each other in order to become ready.
-  publishNotReadyAddresses: true
-  ports:
-    - name: tcp-postgresql
-      port: {{ template "postgresql.v1.service.port" . }}
-      targetPort: tcp-postgresql
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary

charts/postgresql/templates/primary/svc.yaml

@@ -1,51 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "postgresql.v1.primary.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary
-  {{- if or .Values.commonAnnotations .Values.primary.service.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.service.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ .Values.primary.service.type }}
-  {{- if or (eq .Values.primary.service.type "LoadBalancer") (eq .Values.primary.service.type "NodePort") }}
-  externalTrafficPolicy: {{ .Values.primary.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{- if and (eq .Values.primary.service.type "LoadBalancer") (not (empty .Values.primary.service.loadBalancerSourceRanges)) }}
-  loadBalancerSourceRanges: {{ .Values.primary.service.loadBalancerSourceRanges | toJson}}
-  {{- end }}
-  {{- if and (eq .Values.primary.service.type "LoadBalancer") (not (empty .Values.primary.service.loadBalancerIP)) }}
-  loadBalancerIP: {{ .Values.primary.service.loadBalancerIP }}
-  {{- end }}
-  {{- if and .Values.primary.service.clusterIP (eq .Values.primary.service.type "ClusterIP") }}
-  clusterIP: {{ .Values.primary.service.clusterIP }}
-  {{- end }}
-  {{- if .Values.primary.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.primary.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.primary.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.primary.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  ports:
-    - name: tcp-postgresql
-      port: {{ template "postgresql.v1.service.port" . }}
-      targetPort: tcp-postgresql
-      {{- if and (or (eq .Values.primary.service.type "NodePort") (eq .Values.primary.service.type "LoadBalancer")) (not (empty .Values.primary.service.nodePorts.postgresql)) }}
-      nodePort: {{ .Values.primary.service.nodePorts.postgresql }}
-      {{- else if eq .Values.primary.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.primary.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.primary.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: primary

charts/postgresql/templates/prometheusrule.yaml

@@ -1,22 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: PrometheusRule
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.metrics.prometheusRule.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.prometheusRule.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: metrics
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  groups:
-    - name: {{ include "common.names.fullname" . }}
-      rules: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.prometheusRule.rules "context" $ ) | nindent 8 }}
-{{- end }}

charts/postgresql/templates/psp.yaml

@@ -1,42 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create }}
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  privileged: false
-  volumes:
-    - 'configMap'
-    - 'secret'
-    - 'persistentVolumeClaim'
-    - 'emptyDir'
-    - 'projected'
-  hostNetwork: false
-  hostIPC: false
-  hostPID: false
-  runAsUser:
-    rule: 'RunAsAny'
-  seLinux:
-    rule: 'RunAsAny'
-  supplementalGroups:
-    rule: 'MustRunAs'
-    ranges:
-      - min: 1
-        max: 65535
-  fsGroup:
-    rule: 'MustRunAs'
-    ranges:
-      - min: 1
-        max: 65535
-  readOnlyRootFilesystem: false
-{{- end }}

charts/postgresql/templates/read/extended-configmap.yaml

@@ -1,20 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if (include "postgresql.v1.readReplicas.createExtendedConfigmap" .) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-extended-configuration" (include "postgresql.v1.readReplica.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  override.conf: |-
-    {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.extendedConfiguration "context" $ ) | nindent 4 }}
-{{- end }}

charts/postgresql/templates/read/metrics-configmap.yaml

@@ -1,18 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.metrics.enabled .Values.metrics.customMetrics (eq .Values.architecture "replication") }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ printf "%s-metrics" (include "postgresql.v1.readReplica.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-data:
-  custom-metrics.yaml: {{ toYaml .Values.metrics.customMetrics | quote }}
-{{- end }}

charts/postgresql/templates/read/metrics-svc.yaml

@@ -1,31 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.metrics.enabled (eq .Values.architecture "replication") }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ printf "%s-metrics" (include "postgresql.v1.readReplica.fullname" .) }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: metrics-read
-  {{- if or .Values.commonAnnotations .Values.metrics.service.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.service.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  type: ClusterIP
-  sessionAffinity: {{ .Values.metrics.service.sessionAffinity }}
-  {{- if .Values.metrics.service.clusterIP }}
-  clusterIP: {{ .Values.metrics.service.clusterIP }}
-  {{- end }}
-  ports:
-    - name: http-metrics
-      port: {{ .Values.metrics.service.ports.metrics }}
-      targetPort: http-metrics
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-{{- end }}

charts/postgresql/templates/read/networkpolicy.yaml

@@ -1,79 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.primary.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
-metadata:
-  name: {{ include "postgresql.v1.readReplica.fullname" . }}
-  namespace: {{ include "common.names.namespace" . | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.primary.podLabels .Values.commonLabels ) "context" . ) }}
-  podSelector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: read
-  policyTypes:
-    - Ingress
-    - Egress
-  {{- if .Values.primary.networkPolicy.allowExternalEgress }}
-  egress:
-    - {}
-  {{- else }}
-  egress:
-    # Allow dns resolution
-    - ports:
-        - port: 53
-          protocol: UDP
-        - port: 53
-          protocol: TCP
-    # Allow outbound connections to primary
-    - ports:
-        - port: {{ include "postgresql.v1.service.port" . }}
-        - port: {{ .Values.containerPorts.postgresql }}
-      to:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 14 }}
-              app.kubernetes.io/component: primary
-    {{- if .Values.primary.networkPolicy.extraEgress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.networkPolicy.extraEgress "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- end }}
-  ingress:
-    - ports:
-        - port: {{ .Values.containerPorts.postgresql }}
-        {{- if .Values.metrics.enabled }}
-        - port: {{ .Values.metrics.containerPorts.metrics }}
-        {{- end }}
-      {{- if not .Values.primary.networkPolicy.allowExternal }}
-      from:
-        - podSelector:
-            matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 14 }}
-        - podSelector:
-            matchLabels:
-              {{ template "postgresql.v1.primary.fullname" . }}-client: "true"
-        {{- if .Values.primary.networkPolicy.ingressNSMatchLabels }}
-        - namespaceSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.primary.networkPolicy.ingressNSMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- if .Values.primary.networkPolicy.ingressNSPodMatchLabels }}
-          podSelector:
-            matchLabels:
-              {{- range $key, $value := .Values.primary.networkPolicy.ingressNSPodMatchLabels }}
-              {{ $key | quote }}: {{ $value | quote }}
-              {{- end }}
-          {{- end }}
-        {{- end }}
-      {{- end }}
-    {{- if .Values.primary.networkPolicy.extraIngress }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.primary.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
-    {{- end }}
-{{- end }}

charts/postgresql/templates/read/servicemonitor.yaml

@@ -1,46 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled (eq .Values.architecture "replication") }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "postgresql.v1.readReplica.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: metrics-read
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.metrics.serviceMonitor.jobLabel }}
-  jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel }}
-  {{- end }}
-  selector:
-    {{- $svcLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metrics.serviceMonitor.selector .Values.commonLabels ) "context" . ) }}
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $svcLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: metrics-read
-  endpoints:
-    - port: http-metrics
-      {{- if .Values.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.relabelings }}
-      relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.relabelings "context" $) | nindent 6 }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.metricRelabelings "context" $) | nindent 6 }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.honorLabels }}
-      honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
-      {{- end }}
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace | quote }}
-{{- end }}

charts/postgresql/templates/read/statefulset.yaml

@@ -1,553 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if eq .Values.architecture "replication" }}
-{{- $customUser := include "postgresql.v1.username" . }}
-apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
-kind: StatefulSet
-metadata:
-  name: {{ include "postgresql.v1.readReplica.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  {{- $labels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.labels .Values.commonLabels ) "context" . ) }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-  {{- if or .Values.commonAnnotations .Values.readReplicas.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  replicas: {{ .Values.readReplicas.replicaCount }}
-  serviceName: {{ include "postgresql.v1.readReplica.svc.headless" . }}
-  {{- if .Values.readReplicas.updateStrategy }}
-  updateStrategy: {{- toYaml .Values.readReplicas.updateStrategy | nindent 4 }}
-  {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }}
-  selector:
-    matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: read
-  template:
-    metadata:
-      name: {{ include "postgresql.v1.readReplica.fullname" . }}
-      labels: {{- include "common.labels.standard" ( dict "customLabels" $podLabels "context" $ ) | nindent 8 }}
-        app.kubernetes.io/component: read
-      {{- if or (include "postgresql.v1.readReplicas.createExtendedConfigmap" .) .Values.readReplicas.podAnnotations }}
-      annotations:
-        {{- if (include "postgresql.v1.readReplicas.createExtendedConfigmap" .) }}
-        checksum/extended-configuration: {{ pick (include (print $.Template.BasePath "/primary/extended-configmap.yaml") . | fromYaml) "data" | toYaml | sha256sum }}
-        {{- end }}
-        {{- if .Values.readReplicas.podAnnotations }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.podAnnotations "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- end }}
-    spec:
-      {{- if .Values.readReplicas.extraPodSpec }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.extraPodSpec "context" $) | nindent 6 }}
-      {{- end }}
-      serviceAccountName: {{ include "postgresql.v1.serviceAccountName" . }}
-      {{- include "postgresql.v1.imagePullSecrets" . | nindent 6 }}
-      automountServiceAccountToken: {{ .Values.readReplicas.automountServiceAccountToken }}
-      {{- if .Values.readReplicas.hostAliases }}
-      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.hostAliases "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.readReplicas.affinity }}
-      affinity: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.affinity "context" $) | nindent 8 }}
-      {{- else }}
-      affinity:
-        podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.readReplicas.podAffinityPreset "component" "read" "customLabels" $podLabels "context" $) | nindent 10 }}
-        podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.readReplicas.podAntiAffinityPreset "component" "read" "customLabels" $podLabels "context" $) | nindent 10 }}
-        nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.readReplicas.nodeAffinityPreset.type "key" .Values.readReplicas.nodeAffinityPreset.key "values" .Values.readReplicas.nodeAffinityPreset.values) | nindent 10 }}
-      {{- end }}
-      {{- if .Values.readReplicas.nodeSelector }}
-      nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.nodeSelector "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.readReplicas.tolerations }}
-      tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.tolerations "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.readReplicas.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.topologySpreadConstraints "context" $) | nindent 8 }}
-      {{- end }}
-      {{- if .Values.readReplicas.priorityClassName }}
-      priorityClassName: {{ .Values.readReplicas.priorityClassName }}
-      {{- end }}
-      {{- if .Values.readReplicas.schedulerName }}
-      schedulerName: {{ .Values.readReplicas.schedulerName | quote }}
-      {{- end }}
-      {{- if .Values.readReplicas.terminationGracePeriodSeconds }}
-      terminationGracePeriodSeconds: {{ .Values.readReplicas.terminationGracePeriodSeconds }}
-      {{- end }}
-      {{- if .Values.readReplicas.podSecurityContext.enabled }}
-      securityContext: {{- omit .Values.readReplicas.podSecurityContext "enabled" | toYaml | nindent 8 }}
-      {{- end }}
-      hostNetwork: {{ .Values.readReplicas.hostNetwork }}
-      hostIPC: {{ .Values.readReplicas.hostIPC }}
-      {{- if or (and .Values.tls.enabled (not .Values.volumePermissions.enabled)) (and .Values.volumePermissions.enabled (or .Values.readReplicas.persistence.enabled .Values.shmVolume.enabled)) .Values.readReplicas.initContainers }}
-      initContainers:
-        {{- if and .Values.tls.enabled (not .Values.volumePermissions.enabled) }}
-        - name: copy-certs
-          image: {{ include "postgresql.v1.volumePermissions.image" . }}
-          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
-          {{- if .Values.readReplicas.resources }}
-          resources: {{- toYaml .Values.readReplicas.resources | nindent 12 }}
-          {{- end }}
-          # We don't require a privileged container in this case
-          {{- if .Values.readReplicas.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.readReplicas.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
-              chmod 600 {{ include "postgresql.v1.tlsCertKey" . }}
-          volumeMounts:
-            - name: raw-certificates
-              mountPath: /tmp/certs
-            - name: postgresql-certificates
-              mountPath: /opt/bitnami/postgresql/certs
-        {{- else if and .Values.volumePermissions.enabled (or .Values.readReplicas.persistence.enabled .Values.shmVolume.enabled) }}
-        - name: init-chmod-data
-          image: {{ include "postgresql.v1.volumePermissions.image" . }}
-          imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
-          {{- if .Values.readReplicas.resources }}
-          resources: {{- toYaml .Values.readReplicas.resources | nindent 12 }}
-          {{- end }}
-          command:
-            - /bin/sh
-            - -ec
-            - |
-              {{- if .Values.readReplicas.persistence.enabled }}
-              {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-              chown `id -u`:`id -G | cut -d " " -f2` {{ .Values.readReplicas.persistence.mountPath }}
-              {{- else }}
-              chown {{ .Values.readReplicas.containerSecurityContext.runAsUser }}:{{ .Values.readReplicas.podSecurityContext.fsGroup }} {{ .Values.readReplicas.persistence.mountPath }}
-              {{- end }}
-              mkdir -p {{ .Values.readReplicas.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.readReplicas.persistence.mountPath }}/conf {{- end }}
-              chmod 700 {{ .Values.readReplicas.persistence.mountPath }}/data {{- if (include "postgresql.v1.mountConfigurationCM" .) }} {{ .Values.readReplicas.persistence.mountPath }}/conf {{- end }}
-              find {{ .Values.readReplicas.persistence.mountPath }} -mindepth 1 -maxdepth 1 {{- if not (include "postgresql.v1.mountConfigurationCM" .) }} -not -name "conf" {{- end }} -not -name ".snapshot" -not -name "lost+found" | \
-              {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-                xargs -r chown -R `id -u`:`id -G | cut -d " " -f2`
-              {{- else }}
-                xargs -r chown -R {{ .Values.readReplicas.containerSecurityContext.runAsUser }}:{{ .Values.readReplicas.podSecurityContext.fsGroup }}
-              {{- end }}
-              {{- end }}
-              {{- if .Values.shmVolume.enabled }}
-              chmod -R 777 /dev/shm
-              {{- end }}
-              {{- if .Values.tls.enabled }}
-              cp /tmp/certs/* /opt/bitnami/postgresql/certs/
-              {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-              chown -R `id -u`:`id -G | cut -d " " -f2` /opt/bitnami/postgresql/certs/
-              {{- else }}
-              chown -R {{ .Values.readReplicas.containerSecurityContext.runAsUser }}:{{ .Values.readReplicas.podSecurityContext.fsGroup }} /opt/bitnami/postgresql/certs/
-              {{- end }}
-              chmod 600 {{ include "postgresql.v1.tlsCertKey" . }}
-              {{- end }}
-          {{- if eq ( toString ( .Values.volumePermissions.containerSecurityContext.runAsUser )) "auto" }}
-          securityContext: {{- omit .Values.volumePermissions.containerSecurityContext "runAsUser" | toYaml | nindent 12 }}
-          {{- else }}
-          securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            {{ if .Values.readReplicas.persistence.enabled }}
-            - name: data
-              mountPath: {{ .Values.readReplicas.persistence.mountPath }}
-              {{- if .Values.readReplicas.persistence.subPath }}
-              subPath: {{ .Values.readReplicas.persistence.subPath }}
-              {{- end }}
-            {{- end }}
-            {{- if .Values.shmVolume.enabled }}
-            - name: dshm
-              mountPath: /dev/shm
-            {{- end }}
-            {{- if .Values.tls.enabled }}
-            - name: raw-certificates
-              mountPath: /tmp/certs
-            - name: postgresql-certificates
-              mountPath: /opt/bitnami/postgresql/certs
-            {{- end }}
-        {{- end }}
-        {{- if .Values.readReplicas.initContainers }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.initContainers "context" $ ) | nindent 8 }}
-        {{- end }}
-      {{- end }}
-      containers:
-        - name: postgresql
-          image: {{ include "postgresql.v1.image" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
-          {{- if .Values.readReplicas.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.readReplicas.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          {{- else if .Values.readReplicas.command }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.command "context" $) | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.readReplicas.args }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.args "context" $) | nindent 12 }}
-          {{- end }}
-          env:
-            - name: BITNAMI_DEBUG
-              value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }}
-            - name: POSTGRESQL_PORT_NUMBER
-              value: {{ .Values.containerPorts.postgresql | quote }}
-            - name: POSTGRESQL_VOLUME_DIR
-              value: {{ .Values.readReplicas.persistence.mountPath | quote }}
-            {{- if .Values.readReplicas.persistence.mountPath }}
-            - name: PGDATA
-              value: {{ .Values.postgresqlDataDir | quote }}
-            {{- end }}
-            # Authentication
-            {{- if or (eq $customUser "postgres") (empty $customUser) }}
-            {{- if .Values.auth.enablePostgresUser }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.adminPasswordKey" . }}
-            {{- end }}
-            {{- else }}
-            - name: ALLOW_EMPTY_PASSWORD
-              value: "true"
-            {{- end }}
-            {{- else }}
-            - name: POSTGRES_USER
-              value: {{ $customUser | quote }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.userPasswordKey" . }}
-            {{- end }}
-            {{- if .Values.auth.enablePostgresUser }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_POSTGRES_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.adminPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.adminPasswordKey" . }}
-            {{- end }}
-            {{- end }}
-            {{- end }}
-            # Replication
-            - name: POSTGRES_REPLICATION_MODE
-              value: "slave"
-            - name: POSTGRES_REPLICATION_USER
-              value: {{ .Values.auth.replicationUsername | quote }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: POSTGRES_REPLICATION_PASSWORD_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.replicationPasswordKey" .) }}
-            {{- else }}
-            - name: POSTGRES_REPLICATION_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.replicationPasswordKey" . }}
-            {{- end }}
-            - name: POSTGRES_CLUSTER_APP_NAME
-              value: {{ .Values.replication.applicationName }}
-            - name: POSTGRES_MASTER_HOST
-              value: {{ include "postgresql.v1.primary.fullname" . }}
-            - name: POSTGRES_MASTER_PORT_NUMBER
-              value: {{ include "postgresql.v1.service.port" . | quote }}
-            # TLS
-            - name: POSTGRESQL_ENABLE_TLS
-              value: {{ ternary "yes" "no" .Values.tls.enabled | quote }}
-            {{- if .Values.tls.enabled }}
-            - name: POSTGRESQL_TLS_PREFER_SERVER_CIPHERS
-              value: {{ ternary "yes" "no" .Values.tls.preferServerCiphers | quote }}
-            - name: POSTGRESQL_TLS_CERT_FILE
-              value: {{ include "postgresql.v1.tlsCert" . }}
-            - name: POSTGRESQL_TLS_KEY_FILE
-              value: {{ include "postgresql.v1.tlsCertKey" . }}
-            {{- if .Values.tls.certCAFilename }}
-            - name: POSTGRESQL_TLS_CA_FILE
-              value: {{ include "postgresql.v1.tlsCACert" . }}
-            {{- end }}
-            {{- if .Values.tls.crlFilename }}
-            - name: POSTGRESQL_TLS_CRL_FILE
-              value: {{ include "postgresql.v1.tlsCRL" . }}
-            {{- end }}
-            {{- end }}
-            # Audit
-            - name: POSTGRESQL_LOG_HOSTNAME
-              value: {{ .Values.audit.logHostname | quote }}
-            - name: POSTGRESQL_LOG_CONNECTIONS
-              value: {{ .Values.audit.logConnections | quote }}
-            - name: POSTGRESQL_LOG_DISCONNECTIONS
-              value: {{ .Values.audit.logDisconnections | quote }}
-            {{- if .Values.audit.logLinePrefix }}
-            - name: POSTGRESQL_LOG_LINE_PREFIX
-              value: {{ .Values.audit.logLinePrefix | quote }}
-            {{- end }}
-            {{- if .Values.audit.logTimezone }}
-            - name: POSTGRESQL_LOG_TIMEZONE
-              value: {{ .Values.audit.logTimezone | quote }}
-            {{- end }}
-            {{- if .Values.audit.pgAuditLog }}
-            - name: POSTGRESQL_PGAUDIT_LOG
-              value: {{ .Values.audit.pgAuditLog | quote }}
-            {{- end }}
-            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
-              value: {{ .Values.audit.pgAuditLogCatalog | quote }}
-            # Others
-            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
-              value: {{ .Values.audit.clientMinMessages | quote }}
-            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
-              value: {{ .Values.postgresqlSharedPreloadLibraries | quote }}
-            {{- if .Values.readReplicas.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          {{- if or .Values.readReplicas.extraEnvVarsCM .Values.readReplicas.extraEnvVarsSecret }}
-          envFrom:
-            {{- if .Values.readReplicas.extraEnvVarsCM }}
-            - configMapRef:
-                name: {{ .Values.readReplicas.extraEnvVarsCM }}
-            {{- end }}
-            {{- if .Values.readReplicas.extraEnvVarsSecret }}
-            - secretRef:
-                name: {{ .Values.readReplicas.extraEnvVarsSecret }}
-            {{- end }}
-          {{- end }}
-          ports:
-            - name: tcp-postgresql
-              containerPort: {{ .Values.containerPorts.postgresql }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.readReplicas.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.readReplicas.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readReplicas.startupProbe "enabled") "context" $) | nindent 12 }}
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                {{- if (include "postgresql.v1.database" .) }}
-                - exec pg_isready -U {{ default "postgres" $customUser| quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- else }}
-                - exec pg_isready -U {{ default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- end }}
-          {{- end }}
-          {{- if .Values.readReplicas.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.readReplicas.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readReplicas.livenessProbe "enabled") "context" $) | nindent 12 }}
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                {{- if (include "postgresql.v1.database" .) }}
-                - exec pg_isready -U {{ default "postgres" $customUser | quote }} -d "dbname={{ include "postgresql.v1.database" . }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- else }}
-                - exec pg_isready -U {{default "postgres" $customUser | quote }} {{- if and .Values.tls.enabled .Values.tls.certCAFilename }} -d "sslcert={{ include "postgresql.v1.tlsCert" . }} sslkey={{ include "postgresql.v1.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
-                {{- end }}
-          {{- end }}
-          {{- if .Values.readReplicas.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.readReplicas.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readReplicas.readinessProbe "enabled") "context" $) | nindent 12 }}
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - -e
-                {{- include "postgresql.v1.readinessProbeCommand" . | nindent 16 }}
-          {{- end }}
-          {{- end }}
-          {{- if .Values.readReplicas.resources }}
-          resources: {{- toYaml .Values.readReplicas.resources | nindent 12 }}
-          {{- end }}
-          {{- if .Values.readReplicas.lifecycleHooks }}
-          lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.lifecycleHooks "context" $) | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: postgresql-password
-              mountPath: /opt/bitnami/postgresql/secrets/
-            {{- end }}
-            {{- if .Values.readReplicas.extendedConfiguration }}
-            - name: postgresql-extended-config
-              mountPath: {{ .Values.readReplicas.persistence.mountPath }}/conf/conf.d/
-            {{- end }}
-            {{- if .Values.tls.enabled }}
-            - name: postgresql-certificates
-              mountPath: /opt/bitnami/postgresql/certs
-              readOnly: true
-            {{- end }}
-            {{- if .Values.shmVolume.enabled }}
-            - name: dshm
-              mountPath: /dev/shm
-            {{- end }}
-            {{- if .Values.readReplicas.persistence.enabled }}
-            - name: data
-              mountPath: {{ .Values.readReplicas.persistence.mountPath }}
-              {{- if .Values.readReplicas.persistence.subPath }}
-              subPath: {{ .Values.readReplicas.persistence.subPath }}
-              {{- end }}
-            {{- end }}
-            {{- if .Values.readReplicas.extraVolumeMounts }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.extraVolumeMounts "context" $) | nindent 12 }}
-            {{- end }}
-        {{- if .Values.metrics.enabled }}
-        - name: metrics
-          image: {{ include "postgresql.v1.metrics.image" . }}
-          imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
-          {{- if .Values.metrics.containerSecurityContext.enabled }}
-          securityContext: {{- omit .Values.metrics.containerSecurityContext "enabled" | toYaml | nindent 12 }}
-          {{- end }}
-          {{- if .Values.diagnosticMode.enabled }}
-          command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
-          args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.customMetrics }}
-          args: [ "--extend.query-path", "/conf/custom-metrics.yaml" ]
-          {{- end }}
-          env:
-          {{- $database := required "In order to enable metrics you need to specify a database (.Values.auth.database or .Values.global.postgresql.auth.database)" (include "postgresql.v1.database" .) }}
-            - name: DATA_SOURCE_URI
-              value: {{ printf "127.0.0.1:%d/%s?sslmode=disable" (int (include "postgresql.v1.service.port" .)) $database }}
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: DATA_SOURCE_PASS_FILE
-              value: {{ printf "/opt/bitnami/postgresql/secrets/%s" (include "postgresql.v1.userPasswordKey" .) }}
-            {{- else }}
-            - name: DATA_SOURCE_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "postgresql.v1.secretName" . }}
-                  key: {{ include "postgresql.v1.userPasswordKey" . }}
-            {{- end }}
-            - name: DATA_SOURCE_USER
-              value: {{ default "postgres" $customUser | quote }}
-            {{- if .Values.metrics.extraEnvVars }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.metrics.extraEnvVars "context" $) | nindent 12 }}
-            {{- end }}
-          ports:
-            - name: http-metrics
-              containerPort: {{ .Values.metrics.containerPorts.metrics }}
-          {{- if not .Values.diagnosticMode.enabled }}
-          {{- if .Values.metrics.customStartupProbe }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customStartupProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.startupProbe.enabled }}
-          startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.startupProbe "enabled") "context" $) | nindent 12 }}
-            tcpSocket:
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.metrics.customLivenessProbe }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customLivenessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.livenessProbe.enabled }}
-          livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.livenessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: http-metrics
-          {{- end }}
-          {{- if .Values.metrics.customReadinessProbe }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.customReadinessProbe "context" $) | nindent 12 }}
-          {{- else if .Values.metrics.readinessProbe.enabled }}
-          readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.metrics.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: http-metrics
-          {{- end }}
-          {{- end }}
-          volumeMounts:
-            {{- if .Values.auth.usePasswordFiles }}
-            - name: postgresql-password
-              mountPath: /opt/bitnami/postgresql/secrets/
-            {{- end }}
-            {{- if .Values.metrics.customMetrics }}
-            - name: custom-metrics
-              mountPath: /conf
-              readOnly: true
-            {{- end }}
-          {{- if .Values.metrics.resources }}
-          resources: {{- toYaml .Values.metrics.resources | nindent 12 }}
-          {{- end }}
-        {{- end }}
-        {{- if .Values.readReplicas.sidecars }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.sidecars "context" $ ) | nindent 8 }}
-        {{- end }}
-      volumes:
-        {{- if .Values.readReplicas.extendedConfiguration }}
-        - name: postgresql-extended-config
-          configMap:
-            name: {{ include "postgresql.v1.readReplicas.extendedConfigmapName" . }}
-        {{- end }}
-        {{- if .Values.auth.usePasswordFiles }}
-        - name: postgresql-password
-          secret:
-            secretName: {{ include "postgresql.v1.secretName" . }}
-        {{- end }}
-        {{- if .Values.tls.enabled }}
-        - name: raw-certificates
-          secret:
-            secretName: {{ include "postgresql.v1.tlsSecretName" . }}
-        - name: postgresql-certificates
-          emptyDir: {}
-        {{- end }}
-        {{- if and .Values.metrics.enabled .Values.metrics.customMetrics }}
-        - name: custom-metrics
-          configMap:
-            name: {{ printf "%s-metrics" (include "postgresql.v1.readReplica.fullname" .) }}
-        {{- end }}
-        {{- if .Values.shmVolume.enabled }}
-        - name: dshm
-          emptyDir:
-            medium: Memory
-            {{- if .Values.shmVolume.sizeLimit }}
-            sizeLimit: {{ .Values.shmVolume.sizeLimit }}
-            {{- end }}
-        {{- end }}
-        {{- if .Values.readReplicas.extraVolumes }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.readReplicas.extraVolumes "context" $ ) | nindent 8 }}
-        {{- end }}
-  {{- if and .Values.readReplicas.persistence.enabled .Values.readReplicas.persistence.existingClaim }}
-        - name: data
-          persistentVolumeClaim:
-            claimName: {{ tpl .Values.readReplicas.persistence.existingClaim $ }}
-  {{- else if not .Values.readReplicas.persistence.enabled }}
-        - name: data
-          emptyDir: {}
-  {{- else }}
-  {{- if .Values.readReplicas.persistentVolumeClaimRetentionPolicy.enabled }}
-  persistentVolumeClaimRetentionPolicy:
-    whenDeleted: {{ .Values.readReplicas.persistentVolumeClaimRetentionPolicy.whenDeleted }}
-    whenScaled: {{ .Values.readReplicas.persistentVolumeClaimRetentionPolicy.whenScaled }}
-  {{- end }}
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-        {{- if .Values.readReplicas.persistence.annotations }}
-        annotations: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.persistence.annotations "context" $) | nindent 10 }}
-        {{- end }}
-        {{- if .Values.readReplicas.persistence.labels }}
-        labels: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.persistence.labels "context" $) | nindent 10 }}
-        {{- end }}
-      spec:
-        accessModes:
-        {{- range .Values.readReplicas.persistence.accessModes }}
-          - {{ . | quote }}
-        {{- end }}
-        {{- if .Values.readReplicas.persistence.dataSource }}
-        dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.persistence.dataSource "context" $) | nindent 10 }}
-        {{- end }}
-        resources:
-          requests:
-            storage: {{ .Values.readReplicas.persistence.size | quote }}
-        {{- if .Values.readReplicas.persistence.selector }}
-        selector: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.persistence.selector "context" $) | nindent 10 }}
-        {{- end -}}
-        {{- include "common.storage.class" (dict "persistence" .Values.readReplicas.persistence "global" .Values.global) | nindent 8 }}
-  {{- end }}
-{{- end }}

charts/postgresql/templates/read/svc-headless.yaml

@@ -1,38 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if eq .Values.architecture "replication" }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "postgresql.v1.readReplica.svc.headless" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-  annotations:
-    {{- if or .Values.readReplicas.service.headless.annotations .Values.commonAnnotations }}
-    {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.service.headless.annotations .Values.commonAnnotations ) "context" . ) }}
-    {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-    {{- end }}
-    # Use this annotation in addition to the actual publishNotReadyAddresses
-    # field below because the annotation will stop being respected soon but the
-    # field is broken in some versions of Kubernetes:
-    # https://github.com/kubernetes/kubernetes/issues/58662
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-spec:
-  type: ClusterIP
-  clusterIP: None
-  # We want all pods in the StatefulSet to have their addresses published for
-  # the sake of the other Postgresql pods even before they're ready, since they
-  # have to be able to talk to each other in order to become ready.
-  publishNotReadyAddresses: true
-  ports:
-    - name: tcp-postgresql
-      port: {{ include "postgresql.v1.readReplica.service.port" . }}
-      targetPort: tcp-postgresql
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-{{- end }}

charts/postgresql/templates/read/svc.yaml

@@ -1,53 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if eq .Values.architecture "replication" }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "postgresql.v1.readReplica.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-  {{- if or .Values.commonAnnotations .Values.readReplicas.service.annotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.service.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ .Values.readReplicas.service.type }}
-  {{- if or (eq .Values.readReplicas.service.type "LoadBalancer") (eq .Values.readReplicas.service.type "NodePort") }}
-  externalTrafficPolicy: {{ .Values.readReplicas.service.externalTrafficPolicy | quote }}
-  {{- end }}
-  {{- if and (eq .Values.readReplicas.service.type "LoadBalancer") (not (empty .Values.readReplicas.service.loadBalancerSourceRanges)) }}
-  loadBalancerSourceRanges: {{ .Values.readReplicas.service.loadBalancerSourceRanges }}
-  {{- end }}
-  {{- if and (eq .Values.readReplicas.service.type "LoadBalancer") (not (empty .Values.readReplicas.service.loadBalancerIP)) }}
-  loadBalancerIP: {{ .Values.readReplicas.service.loadBalancerIP }}
-  {{- end }}
-  {{- if and .Values.readReplicas.service.clusterIP (eq .Values.readReplicas.service.type "ClusterIP") }}
-  clusterIP: {{ .Values.readReplicas.service.clusterIP }}
-  {{- end }}
-  {{- if .Values.readReplicas.service.sessionAffinity }}
-  sessionAffinity: {{ .Values.readReplicas.service.sessionAffinity }}
-  {{- end }}
-  {{- if .Values.readReplicas.service.sessionAffinityConfig }}
-  sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.service.sessionAffinityConfig "context" $) | nindent 4 }}
-  {{- end }}
-  ports:
-    - name: tcp-postgresql
-      port: {{ include "postgresql.v1.readReplica.service.port" . }}
-      targetPort: tcp-postgresql
-      {{- if and (or (eq .Values.readReplicas.service.type "NodePort") (eq .Values.readReplicas.service.type "LoadBalancer")) (not (empty .Values.readReplicas.service.nodePorts.postgresql)) }}
-      nodePort: {{ .Values.readReplicas.service.nodePorts.postgresql }}
-      {{- else if eq .Values.readReplicas.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.readReplicas.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
-  {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.readReplicas.podLabels .Values.commonLabels ) "context" . ) }}
-  selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: read
-{{- end }}

charts/postgresql/templates/role.yaml

@@ -1,32 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.rbac.create }}
-kind: Role
-apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-# yamllint disable rule:indentation
-rules:
-  {{- if and (include "common.capabilities.psp.supported" .) .Values.psp.create }}
-  - apiGroups:
-      - 'policy'
-    resources:
-      - 'podsecuritypolicies'
-    verbs:
-      - 'use'
-    resourceNames:
-      - {{ include "common.names.fullname" . }}
-  {{- end }}
-  {{- if .Values.rbac.rules }}
-  {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }}
-  {{- end }}
-# yamllint enable rule:indentation
-{{- end }}

charts/postgresql/templates/rolebinding.yaml

@@ -1,24 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.rbac.create }}
-kind: RoleBinding
-apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-roleRef:
-  kind: Role
-  name: {{ include "common.names.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "postgresql.v1.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace | quote }}
-{{- end }}

charts/postgresql/templates/secrets.yaml

@@ -1,99 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- $host := include "postgresql.v1.primary.fullname" . }}
-{{- $port := include "postgresql.v1.service.port" . }}
-{{- $customUser := include "postgresql.v1.username" . }}
-{{- $postgresPassword := include "common.secrets.lookup" (dict "secret" (include "postgresql.v1.secretName" .) "key" (coalesce .Values.global.postgresql.auth.secretKeys.adminPasswordKey .Values.auth.secretKeys.adminPasswordKey) "defaultValue" (ternary (coalesce .Values.global.postgresql.auth.password .Values.auth.password .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (coalesce .Values.global.postgresql.auth.postgresPassword .Values.auth.postgresPassword) (or (empty $customUser) (eq $customUser "postgres"))) "context" $) | trimAll "\"" | b64dec }}
-{{- if and (not $postgresPassword) .Values.auth.enablePostgresUser }}
-{{- $postgresPassword = randAlphaNum 10 }}
-{{- end }}
-{{- $replicationPassword := "" }}
-{{- if eq .Values.architecture "replication" }}
-{{- $replicationPassword = include "common.secrets.passwords.manage" (dict "secret" (include "postgresql.v1.secretName" .) "key" (coalesce .Values.global.postgresql.auth.secretKeys.replicationPasswordKey .Values.auth.secretKeys.replicationPasswordKey) "providedValues" (list "auth.replicationPassword") "context" $) | trimAll "\"" | b64dec }}
-{{- end }}
-{{- $ldapPassword := "" }}
-{{- if and .Values.ldap.enabled (or .Values.ldap.bind_password .Values.ldap.bindpw) }}
-{{- $ldapPassword = coalesce .Values.ldap.bind_password .Values.ldap.bindpw }}
-{{- end }}
-{{- $password := "" }}
-{{- if and (not (empty $customUser)) (ne $customUser "postgres") }}
-{{- $password = include "common.secrets.passwords.manage" (dict "secret" (include "postgresql.v1.secretName" .) "key" (coalesce .Values.global.postgresql.auth.secretKeys.userPasswordKey .Values.auth.secretKeys.userPasswordKey) "providedValues" (list "global.postgresql.auth.password" "auth.password") "context" $) | trimAll "\"" | b64dec }}
-{{- end }}
-{{- $database := include "postgresql.v1.database" . }}
-{{- if (include "postgresql.v1.createSecret" .) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-type: Opaque
-data:
-  {{- if $postgresPassword }}
-  postgres-password: {{ $postgresPassword | b64enc | quote }}
-  {{- end }}
-  {{- if $password }}
-  password: {{ $password | b64enc | quote }}
-  {{- end }}
-  {{- if $replicationPassword }}
-  replication-password: {{ $replicationPassword | b64enc | quote }}
-  {{- end }}
-  # We don't auto-generate LDAP password when it's not provided as we do for other passwords
-  {{- if and .Values.ldap.enabled (or .Values.ldap.bind_password .Values.ldap.bindpw) }}
-  ldap-password: {{ $ldapPassword  | b64enc | quote }}
-  {{- end }}
-{{- end }}
-{{- if .Values.serviceBindings.enabled }}
-{{- if $postgresPassword }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.names.fullname" . }}-svcbind-postgres
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-type: servicebinding.io/postgresql
-data:
-  provider: {{ print "bitnami" | b64enc | quote }}
-  type: {{ print "postgresql" | b64enc | quote }}
-  host: {{ $host | b64enc | quote }}
-  port: {{ $port | b64enc | quote }}
-  username: {{ print "postgres" | b64enc | quote }}
-  database: {{ print "postgres" | b64enc | quote }}
-  password: {{ $postgresPassword | b64enc | quote }}
-  uri: {{ printf "postgresql://postgres:%s@%s:%s/postgres" $postgresPassword $host $port | b64enc | quote }}
-{{- end }}
-{{- if $password }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.names.fullname" . }}-svcbind-custom-user
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-type: servicebinding.io/postgresql
-data:
-  provider: {{ print "bitnami" | b64enc | quote }}
-  type: {{ print "postgresql" | b64enc | quote }}
-  host: {{ $host | b64enc | quote }}
-  port: {{ $port | b64enc | quote }}
-  username: {{ $customUser | b64enc | quote }}
-  password: {{ $password | b64enc | quote }}
-  {{- if $database }}
-  database: {{ $database | b64enc | quote }}
-  {{- end }}
-  uri: {{ printf "postgresql://%s:%s@%s:%s/%s" $customUser $password $host $port $database | b64enc | quote }}
-{{- end }}
-{{- end }}

charts/postgresql/templates/serviceaccount.yaml

@@ -1,18 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "postgresql.v1.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }}
-  {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
-{{- end }}

charts/postgresql/templates/tls-secrets.yaml

@@ -1,30 +0,0 @@
-{{- /*
-Copyright VMware, Inc.
-SPDX-License-Identifier: APACHE-2.0
-*/}}
-
-{{- if (include "postgresql.v1.createTlsSecret" . ) }}
-{{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }}
-{{- $ca := genCA "postgresql-ca" 365 }}
-{{- $fullname := include "common.names.fullname" . }}
-{{- $releaseNamespace := .Release.Namespace }}
-{{- $clusterDomain := .Values.clusterDomain }}
-{{- $primaryHeadlessServiceName := include "postgresql.v1.primary.svc.headless" . }}
-{{- $readHeadlessServiceName := include "postgresql.v1.readReplica.svc.headless" . }}
-{{- $altNames := list (printf "*.%s.%s.svc.%s" $fullname $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $fullname $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $primaryHeadlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $primaryHeadlessServiceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $readHeadlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $readHeadlessServiceName $releaseNamespace $clusterDomain) $fullname }}
-{{- $cert := genSignedCert $fullname nil $altNames 365 $ca }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ $secretName }}
-  namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
-type: kubernetes.io/tls
-data:
-  tls.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.crt" "defaultValue" $cert.Cert "context" $) }}
-  tls.key: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.key" "defaultValue" $cert.Key "context" $) }}
-  ca.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "ca.crt" "defaultValue" $ca.Cert "context" $) }}
-{{- end }}

charts/postgresql/values.schema.json

@@ -1,156 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema#",
-  "type": "object",
-  "properties": {
-    "architecture": {
-      "type": "string",
-      "title": "PostgreSQL architecture",
-      "form": true,
-      "description": "Allowed values: `standalone` or `replication`"
-    },
-    "auth": {
-      "type": "object",
-      "title": "Authentication configuration",
-      "form": true,
-      "properties": {
-        "enablePostgresUser": {
-          "type": "boolean",
-          "title": "Enable \"postgres\" admin user",
-          "description": "Assign a password to the \"postgres\" admin user. Otherwise, remote access will be blocked for this user",
-          "form": true
-        },
-        "postgresPassword": {
-          "type": "string",
-          "title": "Password for the \"postgres\" admin user",
-          "description": "Defaults to a random 10-character alphanumeric string if not set",
-          "form": true
-        },
-        "database": {
-          "type": "string",
-          "title": "PostgreSQL custom database",
-          "description": "Name of the custom database to be created during the 1st initialization of PostgreSQL",
-          "form": true
-        },
-        "username": {
-          "type": "string",
-          "title": "PostgreSQL custom user",
-          "description": "Name of the custom user to be created during the 1st initialization of PostgreSQL. This user only has permissions on the PostgreSQL custom database",
-          "form": true
-        },
-        "password": {
-          "type": "string",
-          "title": "Password for the custom user to create",
-          "description": "Defaults to a random 10-character alphanumeric string if not set",
-          "form": true
-        },
-        "replicationUsername": {
-          "type": "string",
-          "title": "PostgreSQL replication user",
-          "description": "Name of user used to manage replication.",
-          "form": true,
-          "hidden": {
-            "value": "standalone",
-            "path": "architecture"
-          }
-        },
-        "replicationPassword": {
-          "type": "string",
-          "title": "Password for PostgreSQL replication user",
-          "description": "Defaults to a random 10-character alphanumeric string if not set",
-          "form": true,
-          "hidden": {
-            "value": "standalone",
-            "path": "architecture"
-          }
-        }
-      }
-    },
-    "persistence": {
-      "type": "object",
-      "properties": {
-        "size": {
-          "type": "string",
-          "title": "Persistent Volume Size",
-          "form": true,
-          "render": "slider",
-          "sliderMin": 1,
-          "sliderMax": 100,
-          "sliderUnit": "Gi"
-        }
-      }
-    },
-    "resources": {
-      "type": "object",
-      "title": "Required Resources",
-      "description": "Configure resource requests",
-      "form": true,
-      "properties": {
-        "requests": {
-          "type": "object",
-          "properties": {
-            "memory": {
-              "type": "string",
-              "form": true,
-              "render": "slider",
-              "title": "Memory Request",
-              "sliderMin": 10,
-              "sliderMax": 2048,
-              "sliderUnit": "Mi"
-            },
-            "cpu": {
-              "type": "string",
-              "form": true,
-              "render": "slider",
-              "title": "CPU Request",
-              "sliderMin": 10,
-              "sliderMax": 2000,
-              "sliderUnit": "m"
-            }
-          }
-        }
-      }
-    },
-    "replication": {
-      "type": "object",
-      "form": true,
-      "title": "Replication Details",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "title": "Enable Replication",
-          "form": true
-        },
-        "readReplicas": {
-          "type": "integer",
-          "title": "read Replicas",
-          "form": true,
-          "hidden": {
-            "value": "standalone",
-            "path": "architecture"
-          }
-        }
-      }
-    },
-    "volumePermissions": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "form": true,
-          "title": "Enable Init Containers",
-          "description": "Change the owner of the persist volume mountpoint to RunAsUser:fsGroup"
-        }
-      }
-    },
-    "metrics": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "title": "Configure metrics exporter",
-          "form": true
-        }
-      }
-    }
-  }
-}

dev/all-dev-apps.yaml

@@ -1,82 +1,17 @@
 apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
+kind: Application
 metadata:
-  name: development-apps
+  name: development
   namespace: argocd
 spec:
-  goTemplate: true
-  goTemplateOptions: ["missingkey=error"]
-  generators:
-  - git:
-      repoURL: https://github.com/comissions-app/argocd.git
-      revision: HEAD
-      files:
-      - path: "dev/.config/config.json"
-  template:
-    metadata:
-      name: 'core-api'
-    spec:
-      project: 'comissions.app'
-      sources:
-        - repoURL: https://github.com/comissions-app/argocd.git
-          targetRevision: HEAD
-          path: bitnami/postgresql/
-          helm:
-            values: |
-             nameOverride : "comissions-app-db"
-              global:
-                postgresql:
-                  auth:
-                    username: "postgres"
-                    password: "postgres"
-                    database: "comissionsapp" 
-              postgresqlPassword:
-        - repoURL: https://github.com/comissions-app/argocd.git
-          targetRevision: HEAD
-          path: charts/core-api
-          helm:
-            values: |
-              postgresHost: "comissions-app-db"
-              postgresPort: 5432
-              postgresUsername: "postgres"
-              postgresPassword: "postgres"
-              postgresDatabase: "comissionsapp"
-              image:
-                repository: ghcr.io/comissions-app/core-api
-                pullPolicy: Always
-                tag: "latest"
-
-              imagePullSecrets:
-                - name: comissions-app
-                              
-              resources:
-                limits:
-                  cpu: 1
-                requests:
-                  cpu: 100m
-              autoscaling:
-                enabled: true
-                minReplicas: 2
-                maxReplicas: 20
-                targetCPUUtilizationPercentage: 80
-                # targetMemoryUtilizationPercentage: 80
-
-              ingress:
-                enabled: true
-                annotations:
-                  nginx.ingress.kubernetes.io/proxy-body-size: 512m
-                hosts:
-                  - host: 'core-api.comissions.dev'
-                    paths:
-                      - path: /
-                        pathType: ImplementationSpecific
-                tls:
-                  - secretName: 'tls-secret'
-                    hosts:
-                      - 'core-api.comissions.dev'
   destination:
-        server: 'https://kubernetes.default.svc'
-        namespace: 'argocd'
+    namespace: argocd
+    server: https://kubernetes.default.svc
+  project: comissions.app
+  source:
+    path: dev/apps
+    repoURL: https://github.com/comissions-app/argocd.git
+    targetRevision: HEAD
   syncPolicy:
     automated:
       prune: true

dev/apps/core-api.yaml

@@ -0,0 +1,86 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: core-api
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - git:
+      repoURL: https://github.com/comissions-app/argocd.git
+      revision: HEAD
+      files:
+      - path: "dev/.config/config.json"
+  template:
+    metadata:
+      name: 'core-api'
+    spec:
+      project: 'comissions.app'
+      sources:
+        - repoURL: https://github.com/bitnami/charts.git
+          targetRevision: HEAD
+          path: bitnami/postgresql/
+          helm:
+            values: |
+             nameOverride : "comissions-app-db"
+              global:
+                postgresql:
+                  auth:
+                    username: "postgres"
+                    password: "postgres"
+                    database: "comissionsapp" 
+              postgresqlPassword:
+        - repoURL: https://github.com/comissions-app/argocd.git
+          targetRevision: HEAD
+          path: charts/core-api
+          helm:
+            values: |
+              postgresHost: "comissions-app-db"
+              postgresPort: 5432
+              postgresUsername: "postgres"
+              postgresPassword: "postgres"
+              postgresDatabase: "comissionsapp"
+              image:
+                repository: ghcr.io/comissions-app/core-api
+                pullPolicy: Always
+                tag: "latest"
+
+              imagePullSecrets:
+                - name: comissions-app
+                              
+              resources:
+                limits:
+                  cpu: 1
+                requests:
+                  cpu: 100m
+              autoscaling:
+                enabled: true
+                minReplicas: 2
+                maxReplicas: 20
+                targetCPUUtilizationPercentage: 80
+                # targetMemoryUtilizationPercentage: 80
+
+              ingress:
+                enabled: true
+                annotations:
+                  nginx.ingress.kubernetes.io/proxy-body-size: 512m
+                hosts:
+                  - host: 'core-api.comissions.dev'
+                    paths:
+                      - path: /
+                        pathType: ImplementationSpecific
+                tls:
+                  - secretName: 'tls-secret'
+                    hosts:
+                      - 'core-api.comissions.dev'
+      destination:
+        server: 'https://kubernetes.default.svc'
+        namespace: 'argocd'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - ApplyOutOfSyncOnly=true
+          - CreateNamespace=true