rename values props for ca, cert and keys

Author: poblin-orange

.github/workflows/maven.yml

@@ -55,15 +55,15 @@ jobs:
       env:
         DOCKER_IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app
       run: |
-        docker tag ${DOCKER_IMAGE}:${{ github.sha }} ${DOCKER_IMAGE}:0.0.5
-        docker push ${DOCKER_IMAGE}:0.0.5
+        docker tag ${DOCKER_IMAGE}:${{ github.sha }} ${DOCKER_IMAGE}:0.0.6
+        docker push ${DOCKER_IMAGE}:0.0.6
 
     - name: Chart | Push
       uses: appany/[email protected]
       with:
         name: mongodb-probe
         repository: ${{ github.repository }}
-        tag: 0.0.5
+        tag: 0.0.6
         path: chart/mongodb-probe # Default charts/{name}
         registry: ghcr.io
         registry_username: ${{ github.actor }}

chart/mongodb-probe/Chart.yaml

@@ -15,7 +15,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.0.5
+version: 0.0.6
 
 # 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

chart/mongodb-probe/templates/configmap.yaml

@@ -10,13 +10,25 @@ data:
     spring.ssl.bundle.pem.mongodb-ssl-bundle.reload-on-update=false
     
     
-    {{- with .Values.mongodb.tlsSecretCaKey }}
+    {{- with .Values.mongodb.tlsCa }}
     spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.certificate=file:/workspace/config/tls/{{ . }}
     {{- end }}
     
-    {{- with .Values.mongodb.tlsSecretCertificate }}
-    spring.ssl.bundle.pem.mongodb-ssl-bundle.keystore.certificate=file:/workspace/config/tls/{{ . }}    
+    {{- with .Values.mongodb.tlsCert }}
+    spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.certificate=file:/workspace/config/tls/{{ . }}    
     {{- end }}
+
+    {{- with .Values.mongodb.tlsKey }}
+    spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.private-key=file:/workspace/config/tls/{{ . }}    
+    {{- end }}
+
+
+    
+    #spring.ssl.bundle.pem.mongodb-ssl-bundle.keystore.certificate=file:/workspace/config/tls/tlsCertFile
+    #spring.ssl.bundle.pem.mongodb-ssl-bundle.keystore.private-key=file:/workspace/config/tls/tlsKeyFile
+    
+    
+    
     
     spring.data.mongodb.ssl.enabled=true
     spring.data.mongodb.ssl.bundle=mongodb-ssl-bundle

chart/mongodb-probe/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/orange-cloudfoundry/mongodb-probe-app
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.0.5"
+  tag: "0.0.6"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -104,8 +104,11 @@ affinity: {}
 #probe specific default values
 mongodb:
   tlsSecretName: mysecret
-  tlsSecretCaKey: ca.crt
- #tlsSecretCertificate: tls.crt
+  tlsCa: ca.crt
+  tlsCert: tls.crt  
+# tlsKey: xx
+# tlsCertKey: xxx
+  
   database: mydb
   host: localhost
   port: '27017'  

cloudfoundry/app.yaml

@@ -1,7 +1,7 @@
 ---
 version: 1
 applications:
-- name: po-mongodb-probe
+- name: mongodb-probe
   memory: 900M
   instances: 2
   buildpacks:

src/main/resources/application.yaml

@@ -10,6 +10,11 @@ logging:
     org.springframework.boot.env: DEBUG
     org.springframework.context: DEBUG
 
+spring:
+  data:
+    mongodb:
+      ssl-enabled: true
+
 ---
 spring:
   config: