WIP: add deployment layer

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

Author: tmshort

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

@@ -52,7 +52,7 @@ spec:
             - --tls-cert=/var/certs/tls.crt
             - --tls-key=/var/certs/tls.key
             - --pull-cas-dir=/var/ca-certs
-            {{- with .Values.components.operatorController.podArguments }}
+            {{- with .Values.components.catalogd.deployment.podArguments }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
           command:
@@ -62,8 +62,8 @@ spec:
             - name: GOCOVERDIR
               value: /e2e-coverage
           {{- end }}
-          image: "{{ .Values.components.catalogd.image.repository }}:{{ .Values.components.catalogd.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.components.catalogd.image.pullPolicy }}
+          image: "{{ .Values.components.catalogd.deployment.image.repository }}:{{ .Values.components.catalogd.deployment.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.components.catalogd.deployment.image.pullPolicy }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -102,7 +102,7 @@ spec:
               name: olmv1-certificate
               readOnly: true
             {{- end }}
-            {{- with .Values.components.catalogd.volumeMounts }}
+            {{- with .Values.components.catalogd.deployment.volumeMounts }}
               {{- toYaml . | nindent }}
             {{- end }}
       {{- with .Values.podSecurityContext }}
@@ -133,18 +133,18 @@ spec:
             optional: false
             secretName: catalogd-service-cert-git-version
         {{- end }}
-        {{- with .Values.components.catalogd.volumes }}
+        {{- with .Values.components.catalogd.deployment.volumes }}
           {{- toYaml . | indent 8 }}
         {{- end }}
-      {{- with .Values.components.catalogd.nodeSelector }}
+      {{- with .Values.components.catalogd.deployment.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.components.catalogd.affinity }}
+      {{- with .Values.components.catalogd.deployment.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.components.catalogd.tolerations }}
+      {{- with .Values.components.catalogd.deployment.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

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

@@ -71,9 +71,9 @@ spec:
             - name: GOCOVERDIR
               value: /e2e-coverage
           {{- end }}
-          image: "{{ .Values.components.operatorController.image.repository }}:{{ .Values.components.operatorController.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.components.operatorController.deployment.image.repository }}:{{ .Values.components.operatorController.deployment.image.tag | default .Chart.AppVersion }}"
           image: quay.io/operator-framework/operator-controller:devel
-          imagePullPolicy: {{ .Values.components.operatorController.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.components.operatorController.deployment.image.pullPolicy }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -112,7 +112,7 @@ spec:
               name: olmv1-certificate
               readOnly: true
             {{- end }}
-            {{- with .Values.components.operatorController.volumeMounts }}
+            {{- with .Values.components.operatorController.deployment.volumeMounts }}
               {{- toYaml . | nindent }}
             {{- end }}
       {{- with .Values.podSecurityContext }}
@@ -147,18 +147,18 @@ spec:
             optional: false
             secretName: olmv1-cert
         {{- end }}
-        {{- with .Values.components.operatorController.volumes }}
+        {{- with .Values.components.operatorController.deployment.volumes }}
           {{- toYaml . | indent 8 }}
         {{- end }}
-      {{- with .Values.components.operatorController.nodeSelector }}
+      {{- with .Values.components.operatorController.deployment.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.components.operatorController.affinity }}
+      {{- with .Values.components.operatorController.deployment.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.components.operatorController.tolerations }}
+      {{- with .Values.components.operatorController.deployment.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

helm/olmv1/values.yaml

@@ -6,16 +6,17 @@
 components:
   operatorController:
     enabled: true
-    image:
-      repository: quay.io/operator-framework/operator-controller
-      pullPolicy: IfNotPresent
-      tag: devel
-    volumeMounts: {}
-    volumes: {}
-    affinity: {}
-    nodeSelector: {}
-    tolerations: {}
-    podArguments: {}
+    deployment:
+      image:
+        repository: quay.io/operator-framework/operator-controller
+        pullPolicy: IfNotPresent
+        tag: devel
+      volumeMounts: {}
+      volumes: {}
+      affinity: {}
+      nodeSelector: {}
+      tolerations: {}
+      podArguments: {}
     service:
       annotations: {}
     clusterRole:
@@ -24,16 +25,17 @@ components:
       rules: {}
   catalogd:
     enabled: true
-    image:
-      repository: quay.io/operator-framework/catalogd
-      pullPolicy: IfNotPresent
-      tag: devel
-    volumeMounts: {}
-    volumes: {}
-    affinity: {}
-    nodeSelector: {}
-    tolerations: {}
-    podArguments: {}
+    deployment:
+      image:
+        repository: quay.io/operator-framework/catalogd
+        pullPolicy: IfNotPresent
+        tag: devel
+      volumeMounts: {}
+      volumes: {}
+      affinity: {}
+      nodeSelector: {}
+      tolerations: {}
+      podArguments: {}
     service:
       annotations: {}
     clusterRole: