Fix issue with consol.tlsSecretName (#4705)

cloudfoundry · Oct 20, 2020 · 39522f5 · 39522f5
1 parent 3d6d0f7
commit 39522f5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
@@ -345,7 +345,7 @@ spec:
       - name: "{{ .Release.Name }}-cert-volume"
         secret:
           {{- if .Values.console.tlsSecretName }}
-          secretName: "{{ .values.console.tlsSecretName }}"
+          secretName: "{{ .Values.console.tlsSecretName }}"
           {{- else }}
           secretName: "{{ .Release.Name }}-cert"
           {{- end }}

diff --git a/deploy/kubernetes/console/tests/custom-cert_test.yaml b/deploy/kubernetes/console/tests/custom-cert_test.yaml
@@ -0,0 +1,25 @@
+
+suite: test stratos custom certificate
+templates:
+  - deployment.yaml
+tests:
+  - it: should use cert if console.tlsSecretName set
+    set:
+      console.tlsSecretName: my-cert
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes[1]
+          value:
+            name: RELEASE-NAME-cert-volume
+            secret:
+              secretName: my-cert
+  - it: should use default cert if console.tlsSecretName not set
+    release:
+      name: unitest
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes[1]
+          value:
+            name: unitest-cert-volume
+            secret:
+              secretName: unitest-cert
diff --git a/...bernetes/console/tests/database-test.yaml → ...bernetes/console/tests/database_test.yaml b/...bernetes/console/tests/database-test.yaml → ...bernetes/console/tests/database_test.yaml