Fix config issue when cloud is enabled

charts/orchestrator/Chart.yaml

@@ -20,7 +20,7 @@ type: application
 # This is the chart version. This version number should be incremented each time we
 # make changes to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.6
+version: 0.1.7
 
 # This is the version number of the application being deployed. This version number
 # should be incremented each time we make changes to the application. Versions are

charts/orchestrator/example-values/minimal-orchestrator-standalone.yaml

@@ -9,4 +9,4 @@ orchestrator:
 
     http:
       address: >-
-        {{ printf "{{ env.MAVERICS_ADDRESS}}" }}
+        {{ printf "{{ env.MAVERICS_HTTP_ADDRESS}}" }}

charts/orchestrator/templates/statefulset.yaml

@@ -45,13 +45,15 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: MAVERICS_ADDRESS
+            - name: MAVERICS_HTTP_ADDRESS
               value: "0.0.0.0:{{ .Values.service.port }}"
             {{ if .Values.cloud.enabled }}
             - name: MAVERICS_BUNDLE_PUBLIC_KEY_FILE
               value: /etc/maverics/cloud-config/bundle_public_key.pem
+            {{ if .Values.cloud.config.bundleB64 }}
             - name: MAVERICS_CONFIG
               value: /etc/maverics/cloud-config/maverics.tar.gz
+            {{ end }}
             {{ else }}
             - name: MAVERICS_CONFIG
               value: /etc/maverics/config/maverics.yml
@@ -102,25 +104,18 @@ spec:
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /status
-              port: http
-            initialDelaySeconds: 25
-            periodSeconds: 30
+            {{- toYaml .Values.orchestrator.livenessProbe | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /status
-              port: http
-            initialDelaySeconds: 5
-            periodSeconds: 10
+            {{- toYaml .Values.orchestrator.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
-            - name: orchestrator-config
-              mountPath: /etc/maverics/config/
             {{- if .Values.cloud.enabled }}
             - name: cloud-config
               mountPath: /etc/maverics/cloud-config/
+            {{- else }}
+            - name: orchestrator-config
+              mountPath: /etc/maverics/config/
             {{- end }}
             - name: groups-certificates
               mountPath: /etc/maverics/groups/tls

charts/orchestrator/values.yaml

@@ -130,13 +130,24 @@ cloud:
     # Base64 encoded environment bundle public key.
     # The public key can be base64 encoded by running the following:
     #   base64 -i /path/to/env_public_key.pem
-    bundlePublicKeyB64: YmFzZTY0IC1pIC4vZW52X3B1YmxpY19rZXkucGVtCg==
+    bundlePublicKeyB64: ""
     # Base64 encoded bundle file downloaded from Maverics.
     # The bundle can be base64 encoded by running the following:
     #   base64 -i /path/to/maverics.tar.gz
-    bundleB64: YmFzZTY0IC1pIC4vbWF2ZXJpY3MudGFyLmd6Cg==
+    bundleB64: ""
 
 orchestrator:
+  readinessProbe:
+    httpGet:
+      path: /status
+      port: http
+    initialDelaySeconds: 5
+  livenessProbe:
+    httpGet:
+      path: /status
+      port: http
+    initialDelaySeconds: 25
+    periodSeconds: 30
   groups:
     primary:
       # The name of the Orchestrator Group.
@@ -168,7 +179,7 @@ orchestrator:
 
     http:
       address: >-
-        {{ printf "{{ env.MAVERICS_ADDRESS}}" }}
+        {{ printf "{{ env.MAVERICS_HTTP_ADDRESS}}" }}
       routing:
         enabled: true
         type: group