chart: onlyt set ca. config and ca defined out of values.yaml

Author: poblin-orange

chart/mongodb-probe/templates/configmap.yaml

@@ -8,8 +8,7 @@ data:
     spring.profiles.active=k8s
     
     spring.ssl.bundle.pem.mongodb-ssl-bundle.reload-on-update=true
-    spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.certificate=file:/workspace/config/{{ .Values.mongodb.tlsSecretCaKey }}
-    #spring.ssl.bundle.pem.mongodb-ssl-bundle.keystore.private-key=file:/workspace/config/...    
+    spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.certificate=file:/workspace/config/tls/{{ .Values.mongodb.tlsSecretCaKey }}
     
     spring.data.mongodb.uri={{ .Values.mongodb.uri }}
     spring.data.mongodb.ssl.enabled=true

chart/mongodb-probe/templates/deployment.yaml

@@ -57,8 +57,15 @@ spec:
 
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
+          
           volumeMounts:
+            - name: tls
+              mountPath: /workspace/config/tls
+              readOnly: true
+            - name: config
+              mountPath: /workspace/config
+              
+          {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
@@ -67,9 +74,16 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
-          
-      {{- with .Values.volumes }}
       volumes:
+      - name: tls
+        secret:
+          secretName: {{ .Values.mongodb.tlsSecretName }}
+          optional: false
+      - name: config
+        configMap:
+          name: mongodb-probe-config
+          
+      {{- with .Values.volumes }}      
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.nodeSelector }}

chart/mongodb-probe/values.yaml

@@ -79,31 +79,22 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
 
 # Additional volumes on the output Deployment definition.
-volumes:
-- name: config
-  configMap:
-    name: mongodb-probe-config
-    
-- name: tls
-  secret:
-    secretName: {{ .Values.mongodb.tlsSecretname }}
-    optional: false
+volumes: []
+#- name: config
+#  configMap:
+#    name: mongodb-probe-config
 
 # Additional volumeMounts on the output Deployment definition.
-volumeMounts:
-- name: config
-  mountPath: /workspace/config
+volumeMounts: []
+#- name: config
+#  mountPath: /workspace/config
 
-- name: tls
-  mountPath: /workspace/config/tls
-  readOnly: true
 
 # Additional env vars
 envs: []
 # - name: foo
 #   value: "bar"
 
-
 nodeSelector: {}
 
 tolerations: []
@@ -112,7 +103,7 @@ affinity: {}
 
 #probe specific default values
 mongodb:
-  tlsSecretname: mysecret
+  tlsSecretName: mysecret
   tlsSecretCaKey: ca.crt
 
   uri: mongodb://admin:password@localhost:27017/mydb