Skip to content
Snippets Groups Projects
Commit 231d4f8f authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'ozg-3879-mongodb-helmchart' (#178) from ozg-3879-mongodb-helmchart into master

parents 1b65afc1 15f6b350
Branches
Tags
No related merge requests found
...@@ -60,10 +60,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -60,10 +60,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- required "Environment muss angegeben sein" (.Values.kop).environment -}} {{- required "Environment muss angegeben sein" (.Values.kop).environment -}}
{{- end -}} {{- end -}}
{{- define "app.kopBezeichner" -}}
{{- required "kop.bezeichner muss angegeben sein" (.Values.kop).bezeichner -}}
{{- end -}}
{{- define "app.plutoDatabase" -}} {{- define "app.plutoDatabase" -}}
{{- if (.Values.database).databaseName -}} {{- if (.Values.database).databaseName -}}
{{ .Values.database.databaseName }} {{ .Values.database.databaseName }}
...@@ -92,7 +88,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -92,7 +88,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- if ((.Values.database).tls).secretName -}} {{- if ((.Values.database).tls).secretName -}}
{{ .Values.database.tls.secretName }} {{ .Values.database.tls.secretName }}
{{- else -}} {{- else -}}
{{ printf "%s-database-tls-cert" (include "app.kopBezeichner" . ) }} {{ printf "ozg-mongodb-tls-cert" }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
...@@ -100,6 +96,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} ...@@ -100,6 +96,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- if (.Values.database).secretName -}} {{- if (.Values.database).secretName -}}
{{ .Values.database.secretName }} {{ .Values.database.secretName }}
{{- else -}} {{- else -}}
{{ printf "%s-database-admin-pluto-user" (include "app.kopBezeichner" . ) }} {{ printf "ozg-mongodb-admin-pluto-user" }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
\ No newline at end of file
...@@ -37,7 +37,7 @@ tests: ...@@ -37,7 +37,7 @@ tests:
name: spring_data_mongodb_uri name: spring_data_mongodb_uri
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: helm-database-admin-pluto-user name: ozg-mongodb-admin-pluto-user
key: connectionString.standardSrv key: connectionString.standardSrv
optional: false optional: false
- contains: - contains:
...@@ -50,7 +50,7 @@ tests: ...@@ -50,7 +50,7 @@ tests:
content: content:
name: mongodb-root-ca name: mongodb-root-ca
secret: secret:
secretName: helm-database-tls-cert secretName: ozg-mongodb-tls-cert
optional: true optional: true
- it: check external mongodb - it: check external mongodb
...@@ -82,7 +82,7 @@ tests: ...@@ -82,7 +82,7 @@ tests:
release: release:
name: pluto name: pluto
set: set:
database.secretName: ozg-mongodb-database-admin-pluto-user database.secretName: secret-database-admin-pluto-user
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
...@@ -90,7 +90,7 @@ tests: ...@@ -90,7 +90,7 @@ tests:
name: spring_data_mongodb_uri name: spring_data_mongodb_uri
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: ozg-mongodb-database-admin-pluto-user name: secret-database-admin-pluto-user
key: connectionString.standardSrv key: connectionString.standardSrv
optional: false optional: false
- contains: - contains:
...@@ -116,7 +116,7 @@ tests: ...@@ -116,7 +116,7 @@ tests:
content: content:
name: mongodb-root-ca name: mongodb-root-ca
secret: secret:
secretName: helm-database-tls-cert secretName: ozg-mongodb-tls-cert
optional: true optional: true
- it: check mongodb tls set tls cert name - it: check mongodb tls set tls cert name
...@@ -127,7 +127,7 @@ tests: ...@@ -127,7 +127,7 @@ tests:
database: database:
tls: tls:
enabled: true enabled: true
secretName: ozg-mongodb-tls-cert secretName: secret-tls-cert
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].volumeMounts path: spec.template.spec.containers[0].volumeMounts
...@@ -141,5 +141,5 @@ tests: ...@@ -141,5 +141,5 @@ tests:
content: content:
name: mongodb-root-ca name: mongodb-root-ca
secret: secret:
secretName: ozg-mongodb-tls-cert secretName: secret-tls-cert
optional: true optional: true
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment