From 6b93df6b8d68dd483cb535114afd8724ffc20523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Austerm=C3=BChle?= Date: Mon, 11 Mar 2024 21:09:46 +0100 Subject: [PATCH] [pgadmin4] Add support for envVarsExtra (#246) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add support for envVarsExtra * Bump Helm Chart version --------- Signed-off-by: Stephan Austermühle --- charts/pgadmin4/Chart.yaml | 2 +- charts/pgadmin4/README.md | 1 + charts/pgadmin4/templates/deployment.yaml | 3 +++ charts/pgadmin4/values.yaml | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/charts/pgadmin4/Chart.yaml b/charts/pgadmin4/Chart.yaml index 4f9592c8..ec3c652c 100644 --- a/charts/pgadmin4/Chart.yaml +++ b/charts/pgadmin4/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: pgAdmin4 is a web based administration tool for PostgreSQL database name: pgadmin4 -version: 1.23.4 +version: 1.24.0 appVersion: "8.4" keywords: - pgadmin diff --git a/charts/pgadmin4/README.md b/charts/pgadmin4/README.md index 25373044..53e5e359 100644 --- a/charts/pgadmin4/README.md +++ b/charts/pgadmin4/README.md @@ -89,6 +89,7 @@ The command removes nearly all the Kubernetes components associated with the cha | `env.contextPath` | Context path for accessing pgadmin (optional) | `` | | `envVarsFromConfigMaps` | Array of ConfigMap names to load as environment variables | `[]` | | `envVarsFromSecrets` | Array of Secret names to load as environment variables | `[]` | +| `envVarsExtra` | Array of arbitrary environment variable definitions (e.g., for fetching from Kubernetes Secrets) | `[]` | | `persistentVolume.enabled` | If true, pgAdmin4 will create a Persistent Volume Claim | `true` | | `persistentVolume.accessMode` | Persistent Volume access Mode | `ReadWriteOnce` | | `persistentVolume.size` | Persistent Volume size | `10Gi` | diff --git a/charts/pgadmin4/templates/deployment.yaml b/charts/pgadmin4/templates/deployment.yaml index 9238b5c0..b1c17773 100644 --- a/charts/pgadmin4/templates/deployment.yaml +++ b/charts/pgadmin4/templates/deployment.yaml @@ -132,6 +132,9 @@ spec: {{- .Values.readinessProbe | toYaml | nindent 12 }} {{- end }} env: + {{- with .Values.envVarsExtra }} + {{- toYaml . | nindent 12 }} + {{- end }} - name: PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION value: {{ .Values.env.enhanced_cookie_protection | quote }} - name: PGADMIN_DEFAULT_EMAIL diff --git a/charts/pgadmin4/values.yaml b/charts/pgadmin4/values.yaml index 07da4ee8..71e9a28f 100644 --- a/charts/pgadmin4/values.yaml +++ b/charts/pgadmin4/values.yaml @@ -198,6 +198,19 @@ envVarsFromSecrets: [] # - array-of # - secret-names +## Additional environment variables +envVarsExtra: [] + # - name: POSTGRES_USERNAME + # valueFrom: + # secretKeyRef: + # name: pgadmin.pgadmin-db.credentials.postgresql.acid.zalan.do + # key: username + # - name: POSTGRES_PASSWORD + # valueFrom: + # secretKeyRef: + # name: pgadmin.pgadmin-db.credentials.postgresql.acid.zalan.do + # key: password + persistentVolume: ## If true, pgAdmin4 will create/use a Persistent Volume Claim ## If false, use emptyDir