From 91e94969dadece6f4fd50af157dd0c6eb5a6745c Mon Sep 17 00:00:00 2001
From: Johannes Wicovsky <johannes.wicovsky@gmail.com>
Date: Thu, 21 Sep 2023 10:29:06 +0200
Subject: [PATCH] adjust config

---
 templates/pgadmin/ingress_pgadmin.yaml |  2 +-
 templates/pgadmin/statefulset.yaml     | 25 +------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/templates/pgadmin/ingress_pgadmin.yaml b/templates/pgadmin/ingress_pgadmin.yaml
index fe33353..45ae03b 100644
--- a/templates/pgadmin/ingress_pgadmin.yaml
+++ b/templates/pgadmin/ingress_pgadmin.yaml
@@ -10,7 +10,7 @@ metadata:
     nginx.ingress.kubernetes.io/backend-protocol: HTTPS
   labels:
     type: pgadmin
-  name: sma-es-pgadmin
+  name: sma-pgadmin
 spec:
   rules:
   - host: {{ .Values.pgadmin.name }}
diff --git a/templates/pgadmin/statefulset.yaml b/templates/pgadmin/statefulset.yaml
index e5cc6c3..009658d 100644
--- a/templates/pgadmin/statefulset.yaml
+++ b/templates/pgadmin/statefulset.yaml
@@ -29,14 +29,6 @@ spec:
                 secretKeyRef:
                   name: '{{.Release.Name}}-pgadmin-secret'
                   key: password
-{{- if .Values.pgadmin.env.oidc.enabled }}
-            - name: PGADMIN_CONFIG_AUTHENTICATION_SOURCES
-              value: "['oauth2', 'internal']"
-            - name: PGADMIN_CONFIG_OAUTH2_AUTO_CREATE_USER
-              value: "True"
-            - name: PGADMIN_CONFIG_OAUTH2_CONFIG
-              value: "[{ 'OAUTH2_NAME': '{{.Values.pgadmin.env.oidc.name}}', 'OAUTH2_DISPLAY_NAME': '{{.Values.pgadmin.env.oidc.displayName}}','OAUTH2_CLIENT_ID': '{{.Values.pgadmin.env.oidc.clientId}}','OAUTH2_CLIENT_SECRET': '{{.Values.pgadmin.env.oidc.clientSecret}}','OAUTH2_TOKEN_URL': '{{.Values.pgadmin.env.oidc.issuerUrl}}/protocol/openid-connect/token','OAUTH2_AUTHORIZATION_URL': '{{.Values.pgadmin.env.oidc.issuerUrl}}/protocol/openid-connect/auth','OAUTH2_API_BASE_URL': '{{.Values.pgadmin.env.oidc.issuerUrl}}/protocol/openid-connect/','OAUTH2_USERINFO_ENDPOINT': 'userinfo','OAUTH2_SCOPE': '{{.Values.pgadmin.env.oidc.scope}}','OAUTH2_USERNAME_CLAIM': '{{.Values.pgadmin.env.oidc.claim}}', 'OAUTH2_SERVER_METADATA_URL': '{{.Values.pgadmin.env.oidc.issuerUrl}}/.well-known/openid-configuration', 'OAUTH2_ICON': '{{.Values.pgadmin.env.oidc.icon}}', 'OAUTH2_BUTTON_COLOR': '{{.Values.pgadmin.env.oidc.buttonColor}}', }]"
-{{- end }}
           resources:
             limits:
               cpu: 100m
@@ -53,22 +45,7 @@ spec:
               mountPath: /pgadmin4/servers.json
               subPath: servers.json
               readOnly: true
-{{- if .Values.pgadmin.persistentVolume.enabled }}
-            - name: '{{.Release.Name}}-pgadmin-data'
-              mountPath: /var/lib/pgadmin
-{{- end }}
       volumes:
         - name: '{{.Release.Name}}-pgadmin-config'
           configMap:
-            name: '{{.Release.Name}}-pgadmin-config'
-{{- if .Values.pgadmin.persistentVolume.enabled }}
-  volumeClaimTemplates:
-    - metadata:
-        name: '{{.Release.Name}}-pgadmin-data'
-      spec:
-        accessModes: 
-          {{- .Values.pgadmin.persistentVolume.accessModes | toYaml | nindent 8 }}
-        resources:
-          requests:
-            storage: {{ .Values.pgadmin.persistentVolume.size }}
-{{- end }}
+            name: '{{.Release.Name}}-pgadmin-config'
\ No newline at end of file