fix secret creation

camptocamp · Jun 12, 2024 · b2de2f1 · b2de2f1
1 parent 690ee27
commit b2de2f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/apache-mod-mellon/Chart.yaml b/apache-mod-mellon/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: apache-mod-mellon
 description: A Helm chart for deploying an Apache HTTPd configured with the mod_mellon
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: "1.16.0"
diff --git a/apache-mod-mellon/templates/apache-config-mod-mellon.yaml b/apache-mod-mellon/templates/apache-config-mod-mellon.yaml
@@ -1,20 +1,13 @@
 apiVersion: v1
 kind: Secret
-type: Opaque
 metadata:
   annotations:
   labels:
     {{- include "apache-mod-mellon.labels" . | nindent 4 }}-apache
   name: {{ include "apache-mod-mellon.fullname" . }}-mod-mellon
+type: Opaque
 data:
-  mellon.key: |
-    {{ .Values.mellon_config.private_key | b64enc | quote }}
-
-  mellon.cert: |
-    {{ .Values.mellon_config.certificate | b64enc | quote }}
-
-  metadata-signing-cert.pem: |
-    {{ .Values.mellon_config.metadata_signing_cert | b64enc | quote }}
-
-  metadata-idps.xml: |
-    {{ .Values.mellon_config.idps_metadata | b64enc | quote }}
+  mellon.key: {{ .Values.mellon_config.private_key | b64enc | quote }}
+  mellon.cert: {{ .Values.mellon_config.certificate | b64enc | quote }}
+  metadata-signing-cert.pem: {{ .Values.mellon_config.metadata_signing_cert | b64enc | quote }}
+  metadata-idps.xml: {{ .Values.mellon_config.idps_metadata | b64enc | quote }}
diff --git a/apache-mod-mellon/templates/apache-depl.yaml b/apache-mod-mellon/templates/apache-depl.yaml
@@ -37,8 +37,8 @@ spec:
             mountPath: /etc/mod-mellon-config
       volumes:
       - name: mod-mellon-config
-        configMap:
-          name: {{ include "apache-mod-mellon.fullname" . }}-mod-mellon
+        secret:
+          secretName: {{ include "apache-mod-mellon.fullname" . }}-mod-mellon
       - name: virtualhost-config
         configMap:
           name: {{ include "apache-mod-mellon.fullname" . }}-virtualhost