Update helm templates for clusterId and oneClickDemoMode interplay

ngrok · Nov 12, 2024 · f7b93b0 · f7b93b0
1 parent cda68d5
commit f7b93b0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/helm/ngrok-operator/templates/controller-deployment.yaml b/helm/ngrok-operator/templates/controller-deployment.yaml
@@ -62,7 +62,11 @@ spec:
         - /api-manager
         args:
         - --release-name={{ .Release.Name }}
+        {{- if .Values.oneClickDemoMode }}
+        - --cluster-id=one-click-demo-mode
+        {{- else }}
         - --cluster-id={{ .Values.clusterId | required "Missing required .Values.clusterId!"}}
+        {{- end }}
         {{- include "ngrok-operator.manager.cliFeatureFlags" . | nindent 8 }}
         {{- if .Values.oneClickDemoMode }}
         - --one-click-demo-mode

diff --git a/helm/ngrok-operator/tests/controller-deployment_test.yaml b/helm/ngrok-operator/tests/controller-deployment_test.yaml
@@ -246,6 +246,22 @@ tests:
   - contains:
       path: spec.template.spec.containers[0].args
       content: --one-click-demo-mode
+- it: Should pass cluster-id
+  template: controller-deployment.yaml
+  documentIndex: 0 # Document 0 is the deployment since its the first template
+  asserts:
+  - contains:
+      path: spec.template.spec.containers[0].args
+      content: --cluster-id=test-cluster
+- it: Should pass cluster-id as demo mode when enabled
+  template: controller-deployment.yaml
+  documentIndex: 0 # Document 0 is the deployment since its the first template
+  set:
+    oneClickDemoMode: true
+  asserts:
+  - contains:
+      path: spec.template.spec.containers[0].args
+      content: --cluster-id=one-click-demo-mode
 - it: Should pass log format argument if set
   set:
     log: