chao: ensure volumeMounts key present when tls identity supplied

gremlin/Chart.yaml

@@ -1,5 +1,5 @@
 name: gremlin
-version: 0.25.0
+version: 0.25.1
 description: The Gremlin Inc client application
 apiVersion: v1
 home: https://www.gremlin.com

gremlin/templates/chao-deployment.yaml

@@ -129,7 +129,7 @@ spec:
             {{- end }}
           imagePullPolicy: {{ .Values.chaoimage.pullPolicy }}
           name: chao
-{{- if (or ((eq (include "gremlin.secretType" .) "certificate")) .Values.ssl.certFile) }}
+{{- if (or ((eq (include "gremlin.secretType" .) "certificate")) .Values.ssl.certFile (include "chaoTlsIdentityVolumeMounts" .)) }}
           volumeMounts:
 {{- end }}
 {{- if (eq (include "gremlin.secretType" .) "certificate") }}

gremlin/tests/chao_deployment_auth_test.yaml

@@ -0,0 +1,85 @@
+suite: Test Chao deployment auth
+templates:
+  - chao-deployment.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+  revision: 1
+  upgrade: true
+
+tests:
+  - it: should specify a team ID in the environment when not managed by a secret
+    set:
+      gremlin.secret.managed: false
+      gremlin.teamID: "01719721-1be8-4315-b197-211be83315a4"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[0].name
+          value: "GREMLIN_TEAM_ID"
+      - equal:
+          path: spec.template.spec.containers[0].env[0].value
+          value: "01719721-1be8-4315-b197-211be83315a4"
+  - it: should populate the team ID from the managed secret when managed secret is set
+    set:
+      gremlin.secret.managed: true
+      gremlin.secret.teamID: "01719721-1be8-4315-b197-211be83315a4"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[0].name
+          value: "GREMLIN_TEAM_ID"
+      - equal:
+          path: spec.template.spec.containers[0].env[0].valueFrom.secretKeyRef.name
+          value: "gremlin-secret"
+  - it: should specify a cluster ID in the environment when not managed by a secret
+    set:
+      gremlin.secret.managed: false
+      gremlin.clusterID: "my-cluster"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[1].name
+          value: "GREMLIN_CLUSTER_ID"
+      - equal:
+          path: spec.template.spec.containers[0].env[1].value
+          value: "my-cluster"
+  - it: should populate the cluster ID from the managed secret when managed secret is set
+    set:
+      gremlin.secret.managed: true
+      gremlin.secret.clusterID: "my-cluster"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[1].name
+          value: "GREMLIN_CLUSTER_ID"
+      - equal:
+          path: spec.template.spec.containers[0].env[1].valueFrom.secretKeyRef.name
+          value: "gremlin-secret"
+  - it: should set GREMLIN_TEAM_SECRET when secret type is set to secret and secret is managed
+    set:
+      gremlin.secret.managed: true
+      gremlin.secret.type: secret
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[2].name
+          value: "GREMLIN_TEAM_SECRET"
+      - equal:
+          path: spec.template.spec.containers[0].env[2].valueFrom.secretKeyRef.name
+          value: "gremlin-secret"
+  - it: should set the secret name to gremlin-team-cert when not managed and no custom secret name is set
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes[0].secret.secretName
+          value: "gremlin-team-cert"
+  - it: should set the secret name to the gremlin-secret when managed and no custom secret name is set
+    set:
+      gremlin.secret.managed: true
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes[0].secret.secretName
+          value: "gremlin-secret"
+  - it: should set the secret name to the custom secret name when set
+    set:
+      gremlin.secret.managed: true
+      gremlin.secret.name: "my-custom-secret"
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes[0].secret.secretName
+          value: "my-custom-secret"

gremlin/tests/chao_deployment_test.yaml → gremlin/tests/chao_deployment_certauth_test.yaml

@@ -6,6 +6,10 @@ release:
   namespace: my-namespace
   revision: 1
   upgrade: true
+
+values:
+  - values-certauth-test.yaml
+
 tests:
   - it: should create a deployment
     set:
@@ -34,61 +38,6 @@ tests:
       - equal:
           path: spec.template.spec.imagePullSecrets[0].name
           value: "my-pull-secret"
-  - it: should specify a team ID in the environment when not managed by a secret
-    set:
-      gremlin.secret.managed: false
-      gremlin.teamID: "01719721-1be8-4315-b197-211be83315a4"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].env[0].name
-          value: "GREMLIN_TEAM_ID"
-      - equal:
-          path: spec.template.spec.containers[0].env[0].value
-          value: "01719721-1be8-4315-b197-211be83315a4"
-  - it: should populate the team ID from the managed secret when managed secret is set
-    set:
-      gremlin.secret.managed: true
-      gremlin.secret.teamID: "01719721-1be8-4315-b197-211be83315a4"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].env[0].name
-          value: "GREMLIN_TEAM_ID"
-      - equal:
-          path: spec.template.spec.containers[0].env[0].valueFrom.secretKeyRef.name
-          value: "gremlin-secret"
-  - it: should specify a cluster ID in the environment when not managed by a secret
-    set:
-      gremlin.secret.managed: false
-      gremlin.clusterID: "my-cluster"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].env[1].name
-          value: "GREMLIN_CLUSTER_ID"
-      - equal:
-          path: spec.template.spec.containers[0].env[1].value
-          value: "my-cluster"
-  - it: should populate the cluster ID from the managed secret when managed secret is set
-    set:
-      gremlin.secret.managed: true
-      gremlin.secret.clusterID: "my-cluster"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].env[1].name
-          value: "GREMLIN_CLUSTER_ID"
-      - equal:
-          path: spec.template.spec.containers[0].env[1].valueFrom.secretKeyRef.name
-          value: "gremlin-secret"
-  - it: should set GREMLIN_TEAM_SECRET when secret type is set to secret and secret is managed
-    set:
-      gremlin.secret.managed: true
-      gremlin.secret.type: secret
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].env[2].name
-          value: "GREMLIN_TEAM_SECRET"
-      - equal:
-          path: spec.template.spec.containers[0].env[2].valueFrom.secretKeyRef.name
-          value: "gremlin-secret"
   - it: should mount the gremlin-team-cert volume when a certificate is used and secret is not managed
     set:
       gremlin.secret.managed: false
@@ -143,26 +92,6 @@ tests:
             name: gremlin-cert
             secret:
               secretName: gremlin-secret
-  - it: should set the secret name to gremlin-team-cert when not managed and no custom secret name is set
-    asserts:
-      - equal:
-          path: spec.template.spec.volumes[0].secret.secretName
-          value: "gremlin-team-cert"
-  - it: should set the secret name to the gremlin-secret when managed and no custom secret name is set
-    set:
-      gremlin.secret.managed: true
-    asserts:
-      - equal:
-          path: spec.template.spec.volumes[0].secret.secretName
-          value: "gremlin-secret"
-  - it: should set the secret name to the custom secret name when set
-    set:
-      gremlin.secret.managed: true
-      gremlin.secret.name: "my-custom-secret"
-    asserts:
-      - equal:
-          path: spec.template.spec.volumes[0].secret.secretName
-          value: "my-custom-secret"
 
   # chao.tls.identity tests