updating syntax for aws marketplace

dabble-of-devops-bioanalyze · Mar 8, 2022 · 6b71a48 · 6b71a48
1 parent 4fcfaf9
commit 6b71a48
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/charts/shinyproxy/Chart.yaml b/charts/shinyproxy/Chart.yaml
@@ -10,4 +10,4 @@ dependencies:
     tags:
       - bitnami-common
     version: 1.x.x
-version: 0.10.7
+version: 0.10.8
diff --git a/charts/shinyproxy/templates/deployment.yaml b/charts/shinyproxy/templates/deployment.yaml
@@ -55,19 +55,19 @@ spec:
             - name: http
               containerPort: {{ .Values.containerPorts.http }}
           env:
-          {{- if not .Values.authExistingSecretEnabled -}}
+            {{- if .Values.authExistingSecretEnabled }}
             - name: SPRING_APPLICATION_JSON
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "common.names.fullname" . }}
-                  key: secrets.json
-          {{ else }}
+                  name: {{ .Values.authExistingSecret.secretKeyRef.name }}
+                  key: {{ .Values.authExistingSecret.secretKeyRef.key }}
+            {{- else }}
             - name: SPRING_APPLICATION_JSON
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.authExistingSecret.secretRef.name }}
-                  key: {{ .Values.authExistingSecret.secretRef.key }}
-          {{ end }}
+                  name: {{ include "common.names.fullname" . }}
+                  key: secrets.json
+            {{- end }}
           volumeMounts:
           - name: application-conf
             mountPath: /opt/shinyproxy/application.yml

diff --git a/tests/shinyproxy/test_shinyproxy.py b/tests/shinyproxy/test_shinyproxy.py
@@ -324,8 +324,8 @@ def test_auth_existing_secret():
     values_file = os.path.join(os.path.dirname(__file__), "values-auth-existing-secret.yaml")
     chart = HelmChart(chart_name=chart_name, helm_dir=helm_dir, values_file=values_file)
     chart.run_helm_template(files=["deployment.yaml"])
-    secret_name = chart.values_data['authExistingSecret']['secretRef']['name']
-    secret_key = chart.values_data['authExistingSecret']['secretRef']['key']
+    secret_name = chart.values_data['authExistingSecret']['secretKeyRef']['name']
+    secret_key = chart.values_data['authExistingSecret']['secretKeyRef']['key']
 
     deployment_data = chart.rendered_data["deployment.yaml"]
     container_env = deployment_data['spec']['template']['spec']['containers'][0]['env']

diff --git a/tests/shinyproxy/values-auth-existing-secret.yaml b/tests/shinyproxy/values-auth-existing-secret.yaml
@@ -1,5 +1,5 @@
 authExistingSecretEnabled: true
 authExistingSecret:
-  secretRef:
+  secretKeyRef:
     name: "my-shinyproxy-auth-secret"
     key: "super-secrets.json"