Skip to content

Commit cb22b14

Browse files
committed
add conditional on uri and cert for application.properties
1 parent 8c86b96 commit cb22b14

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

chart/mongodb-probe/templates/configmap.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@ data:
77
application.properties: |
88
spring.profiles.active=k8s
99
10-
spring.ssl.bundle.pem.mongodb-ssl-bundle.reload-on-update=true
11-
spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.certificate=file:/workspace/config/tls/{{ .Values.mongodb.tlsSecretCaKey }}
12-
spring.ssl.bundle.pem.mongodb-ssl-bundle.keystore.certificate=file:/workspace/config/tls/{{ .Values.mongodb.tlsSecretCertificate }}
10+
spring.ssl.bundle.pem.mongodb-ssl-bundle.reload-on-update=false
11+
12+
13+
{{- with .Values.mongodb.tlsSecretCaKey }}
14+
spring.ssl.bundle.pem.mongodb-ssl-bundle.truststore.certificate=file:/workspace/config/tls/{{ . }}
15+
{{- end }}
16+
17+
{{- with .Values.mongodb.tlsSecretCertificate }}
18+
spring.ssl.bundle.pem.mongodb-ssl-bundle.keystore.certificate=file:/workspace/config/tls/{{ . }}
19+
{{- end }}
1320
1421
spring.data.mongodb.ssl.enabled=true
1522
spring.data.mongodb.ssl.bundle=mongodb-ssl-bundle
16-
17-
#spring.data.mongodb.uri=.Values.mongodb.uri
23+
24+
{{- with .Values.mongodb.uri }}
25+
spring.data.mongodb.uri={{ . }}
26+
{{- end }}
1827
1928
spring.data.mongodb.host={{ .Values.mongodb.host }}
2029
spring.data.mongodb.port={{ .Values.mongodb.port }}

chart/mongodb-probe/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ affinity: {}
105105
mongodb:
106106
tlsSecretName: mysecret
107107
tlsSecretCaKey: ca.crt
108-
tlsSecretCertificate: tls.crt
108+
#tlsSecretCertificate: tls.crt
109109
database: mydb
110110
host: localhost
111111
port: '27017'

0 commit comments

Comments
 (0)