replace configmap with secret and use library chart tpl

charts/pgadmin/Chart.yaml

@@ -20,7 +20,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -29,5 +29,5 @@ appVersion: latest
 
 dependencies:
   - name: library-chart
-    version: 1.4.3
+    version: 1.5.17
     repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/pgadmin/templates/deployment.yaml

@@ -92,8 +92,8 @@ spec:
               MC_HOST_s3=https://$AWS_ACCESS_KEY_ID:$AWS_SECRET_ACCESS_KEY:$AWS_SESSION_TOKEN@$AWS_S3_ENDPOINT mc cp -r s3/{{ .Values.s3.path }} /data/{{ include "pgadmin.cleanemail" . }}
               exit 0
           envFrom:
-            - configMapRef:
-                name: {{ include "library-chart.configMapNameS3" . }}
+            - secretRef:
+                name: {{ include "library-chart.secretNameS3" . }}
           env:
           - name: HOME
             value: /tmp

charts/pgadmin/templates/networkpolicy-ingress.yaml

@@ -1,17 +1 @@
-{{- if .Values.security.networkPolicy.enabled -}}
-{{- if .Values.ingress.enabled -}}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "library-chart.fullname" . }}-2
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "library-chart.selectorLabels" . | nindent 6 }}
-  ingress:
-  - from:
-    {{- toYaml .Values.security.networkPolicy.from | nindent 4 }}
-  policyTypes:
-  - Ingress
-{{- end }}
-{{- end }} 
+{{ include "library-chart.networkPolicyIngress" . }}

charts/pgadmin/templates/networkpolicy.yaml

@@ -1,15 +1 @@
-{{- if .Values.security.networkPolicy.enabled -}}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "library-chart.fullname" . }}
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "library-chart.selectorLabels" . | nindent 6 }}
-  ingress:
-  - from:
-    - podSelector: {}
-  policyTypes:
-  - Ingress
-{{- end }} 
+{{ include "library-chart.networkPolicy" . }}

charts/pgadmin/templates/secret-s3.yaml

@@ -0,0 +1 @@
+{{ include "library-chart.secretS3" . }}

charts/pgadmin/templates/serviceaccount.yaml

@@ -1,12 +1 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "library-chart.serviceAccountName" . }}
-  labels:
-    {{- include "library-chart.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
+{{ include "library-chart.serviceAccount" . }}