WIP: Fix value arrays, add pod env, update image

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml

@@ -57,13 +57,18 @@ spec:
             {{- end }}
           command:
             - ./catalogd
-          {{- if .Values.components.e2e.enabled }}
+          {{- if or .Values.components.e2e.enabled .Values.components.catalogd.deployment.env }}
           env:
+          {{- end }}
+          {{- if .Values.components.e2e.enabled }}
             - name: GOCOVERDIR
               value: /e2e-coverage
           {{- end }}
-          image: "{{ .Values.components.catalogd.deployment.image.repository }}:{{ .Values.components.catalogd.deployment.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.components.catalogd.deployment.image.pullPolicy }}
+          {{- with .Values.components.catalogd.deployment.env}}
+          {{- toYamlPretty . | nindent 12 }}
+          {{- end }}
+          image: "{{ .Values.components.catalogd.deployment.image }}"
+          imagePullPolicy: {{ .Values.components.catalogd.deployment.imagePullPolicy }}
           livenessProbe:
             httpGet:
               path: /healthz

helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml

@@ -62,18 +62,23 @@ spec:
             - --tls-cert=/var/certs/tls.cert
             - --tls-key=/var/certs/tls.key
             {{- with .Values.components.catalogd.podArguments }}
-            {{- toYaml . | nindent 12 }}
+            {{- toYamlPretty . | nindent 12 }}
             {{- end }}
           command:
             - /operator-controller
-          {{- if .Values.components.e2e.enabled }}
+          {{- if or .Values.components.e2e.enabled .Values.components.operatorController.deployment.env }}
           env:
+          {{- end }}
+          {{- if .Values.components.e2e.enabled }}
             - name: GOCOVERDIR
               value: /e2e-coverage
           {{- end }}
-          image: "{{ .Values.components.operatorController.deployment.image.repository }}:{{ .Values.components.operatorController.deployment.image.tag | default .Chart.AppVersion }}"
+          {{- with .Values.components.operatorController.deployment.env }}
+          {{- toYamlPretty . | nindent 12 }}
+          {{- end }}
+          image: "{{ .Values.components.operatorController.deployment.image }}"
           image: quay.io/operator-framework/operator-controller:devel
-          imagePullPolicy: {{ .Values.components.operatorController.deployment.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.components.operatorController.deployment.imagePullPolicy }}
           livenessProbe:
             httpGet:
               path: /healthz

helm/olmv1/values.yaml

@@ -7,41 +7,39 @@ components:
   operatorController:
     enabled: true
     deployment:
-      image:
-        repository: quay.io/operator-framework/operator-controller
-        pullPolicy: IfNotPresent
-        tag: devel
-      volumeMounts: {}
-      volumes: {}
+      image: quay.io/operator-framework/operator-controller:devel
+      imagePullPolicy: IfNotPresent
+      volumeMounts: []
+      volumes: []
       affinity: {}
       nodeSelector: {}
-      tolerations: {}
-      podArguments: {}
+      tolerations: []
+      podArguments: []
+      env: []
     service:
       annotations: {}
     clusterRole:
-      rules: {}
+      rules: []
     role:
-      rules: {}
+      rules: []
   catalogd:
     enabled: true
     deployment:
-      image:
-        repository: quay.io/operator-framework/catalogd
-        pullPolicy: IfNotPresent
-        tag: devel
-      volumeMounts: {}
-      volumes: {}
+      image: quay.io/operator-framework/catalogd:devel
+      imagePullPolicy: IfNotPresent
+      volumeMounts: []
+      volumes: []
       affinity: {}
       nodeSelector: {}
-      tolerations: {}
-      podArguments: {}
+      tolerations: []
+      podArguments: []
+      env: []
     service:
       annotations: {}
     clusterRole:
-      rules: {}
+      rules: []
     role:
-      rules: {}
+      rules: []
   certManager:
     enabled: true
   e2e: