fix: allow converting envs from value to valueFrom (#643)

Author: Samu

charts/kvisor/templates/_helpers.tpl

@@ -61,18 +61,21 @@ Create chart name and version as used by the chart label.
 {{- else if .Values.castai.clusterID }}
 - name: CLUSTER_ID
   value: {{ .Values.castai.clusterID | quote }}
+  valueFrom: null # workaround for https://github.com/helm/helm/issues/8994
 {{- else if .Values.castai.clusterIdConfigMapKeyRef.name }}
 - name: CLUSTER_ID
   valueFrom:
     configMapKeyRef:
       name: {{ .Values.castai.clusterIdConfigMapKeyRef.name }}
       key: {{ .Values.castai.clusterIdConfigMapKeyRef.key }}
+  value: null # workaround for https://github.com/helm/helm/issues/8994
 {{- else if .Values.castai.clusterIdSecretKeyRef.name }}
 - name: CLUSTER_ID
   valueFrom:
     secretKeyRef:
       name: {{ .Values.castai.clusterIdSecretKeyRef.name }}
       key: {{ .Values.castai.clusterIdSecretKeyRef.key }}
+  value: null # workaround for https://github.com/helm/helm/issues/8994
 {{- else if not $envFrom }}
   {{- fail "castai.clusterID, castai.clusterIdConfigMapKeyRef or castai.clusterIdSecretKeyRef must be provided" }}
 {{- end }}

charts/kvisor/tests/cluster-id/test.yaml

@@ -13,13 +13,15 @@ tests:
           content:
             name: CLUSTER_ID
             value: "test-cluster-id"
+            valueFrom: null
         template: agent.yaml
         documentIndex: 0
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: CLUSTER_ID
             value: "test-cluster-id"
+            valueFrom: null
         template: controller.yaml
         documentIndex: 0
 
@@ -38,6 +40,7 @@ tests:
               configMapKeyRef:
                 name: "cluster-config"
                 key: "CLUSTER_ID"
+            value: null
         template: agent.yaml
         documentIndex: 0
       - contains:
@@ -48,6 +51,7 @@ tests:
               configMapKeyRef:
                 name: "cluster-config"
                 key: "CLUSTER_ID"
+            value: null
         template: controller.yaml
         documentIndex: 0
 
@@ -66,6 +70,7 @@ tests:
               secretKeyRef:
                 name: "cluster-secret"
                 key: "CLUSTER_ID"
+            value: null
         template: agent.yaml
         documentIndex: 0
       - contains:
@@ -76,6 +81,7 @@ tests:
               secretKeyRef:
                 name: "cluster-secret"
                 key: "CLUSTER_ID"
+            value: null
         template: controller.yaml
         documentIndex: 0
 
@@ -94,6 +100,7 @@ tests:
               configMapKeyRef:
                 name: "my-config"
                 key: "MY_CUSTOM_KEY"
+            value: null
         template: agent.yaml
         documentIndex: 0
 
@@ -135,6 +142,7 @@ tests:
               configMapKeyRef:
                 name: "cluster-config"
                 key: "CONFIG_KEY"
+            value: null
         template: agent.yaml
         documentIndex: 0
       - notContains:
@@ -145,5 +153,6 @@ tests:
               secretKeyRef:
                 name: "cluster-secret"
                 key: "SECRET_KEY"
+            value: null
         template: agent.yaml
         documentIndex: 0