WIP: more parameterization

tmshort · tmshort · commit 1bf2d65299b6 · 2025-07-29T11:20:35.000-04:00
Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/helm/olmv1/templates/00-namespace.yml b/helm/olmv1/templates/00-namespace.yml
@@ -4,9 +4,13 @@ kind: Namespace
 metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
+    {{- with .Values.namespaces.olmv1.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   labels:
     app.kubernetes.io/name: olmv1
     {{- include "olmv1.labels" . | nindent 4 }}
-    pod-security.kubernetes.io/enforce: restricted
-    pod-security.kubernetes.io/enforce-version: latest
-  name: {{ .Values.namespaces.olmv1 }}
+    {{- with .Values.namespaces.olmv1.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  name: {{ .Values.namespaces.olmv1.name }}
diff --git a/helm/olmv1/templates/03-serviceaccount-olmv1-system-catalogd-controller-manager.yml b/helm/olmv1/templates/03-serviceaccount-olmv1-system-catalogd-controller-manager.yml
@@ -8,5 +8,5 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-controller-manager
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/04-serviceaccount-olmv1-system-operator-controller-controller-manager.yml b/helm/olmv1/templates/04-serviceaccount-olmv1-system-operator-controller-controller-manager.yml
@@ -8,5 +8,5 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-controller-manager
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/05-role-olmv1-system-catalogd-leader-election-role.yml b/helm/olmv1/templates/05-role-olmv1-system-catalogd-leader-election-role.yml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-leader-election-role
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 rules:
   - apiGroups:
       - ""
diff --git a/helm/olmv1/templates/06-role-olmv1-system-catalogd-manager-role.yml b/helm/olmv1/templates/06-role-olmv1-system-catalogd-manager-role.yml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-manager-role
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 rules:
   - apiGroups:
       - ""
diff --git a/helm/olmv1/templates/07-role-olmv1-system-operator-controller-leader-election-role.yml b/helm/olmv1/templates/07-role-olmv1-system-operator-controller-leader-election-role.yml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-leader-election-role
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 rules:
   - apiGroups:
       - ""
diff --git a/helm/olmv1/templates/08-role-olmv1-system-operator-controller-manager-role.yml b/helm/olmv1/templates/08-role-olmv1-system-operator-controller-manager-role.yml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-manager-role
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 rules:
   - apiGroups:
       - ""
diff --git a/helm/olmv1/templates/17-rolebinding-olmv1-system-catalogd-leader-election-rolebinding.yml b/helm/olmv1/templates/17-rolebinding-olmv1-system-catalogd-leader-election-rolebinding.yml
@@ -9,13 +9,13 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-leader-election-rolebinding
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: catalogd-leader-election-role
 subjects:
   - kind: ServiceAccount
     name: catalogd-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/18-rolebinding-olmv1-system-catalogd-manager-rolebinding.yml b/helm/olmv1/templates/18-rolebinding-olmv1-system-catalogd-manager-rolebinding.yml
@@ -9,13 +9,13 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-manager-rolebinding
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: catalogd-manager-role
 subjects:
   - kind: ServiceAccount
     name: catalogd-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/19-rolebinding-olmv1-system-operator-controller-leader-election-rolebinding.yml b/helm/olmv1/templates/19-rolebinding-olmv1-system-operator-controller-leader-election-rolebinding.yml
@@ -9,13 +9,13 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-leader-election-rolebinding
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: operator-controller-leader-election-role
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/20-rolebinding-olmv1-system-operator-controller-manager-rolebinding.yml b/helm/olmv1/templates/20-rolebinding-olmv1-system-operator-controller-manager-rolebinding.yml
@@ -9,13 +9,13 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-manager-rolebinding
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: operator-controller-manager-role
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/21-clusterrolebinding-catalogd-manager-rolebinding.yml b/helm/olmv1/templates/21-clusterrolebinding-catalogd-manager-rolebinding.yml
@@ -16,5 +16,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: catalogd-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/22-clusterrolebinding-catalogd-proxy-rolebinding.yml b/helm/olmv1/templates/22-clusterrolebinding-catalogd-proxy-rolebinding.yml
@@ -16,5 +16,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: catalogd-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/23-clusterrolebinding-operator-controller-manager-rolebinding.yml b/helm/olmv1/templates/23-clusterrolebinding-operator-controller-manager-rolebinding.yml
@@ -16,5 +16,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/24-clusterrolebinding-operator-controller-proxy-rolebinding.yml b/helm/olmv1/templates/24-clusterrolebinding-operator-controller-proxy-rolebinding.yml
@@ -16,5 +16,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: operator-controller-controller-manager
-    namespace: {{ .Values.namespaces.olmv1 }}
+    namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/25-configmap-olmv1-system-e2e-registries-conf.yml b/helm/olmv1/templates/25-configmap-olmv1-system-e2e-registries-conf.yml
@@ -13,5 +13,5 @@ metadata:
     app.kubernetes.io/name: e2e
     {{- include "olmv1.labels" . | nindent 4 }}
   name: e2e-registries-conf
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 {{- end }}
diff --git a/helm/olmv1/templates/26-service-olmv1-system-catalogd-service.yml b/helm/olmv1/templates/26-service-olmv1-system-catalogd-service.yml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-service
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   ports:
     - name: https
diff --git a/helm/olmv1/templates/27-service-olmv1-system-operator-controller-service.yml b/helm/olmv1/templates/27-service-olmv1-system-operator-controller-service.yml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-service
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   ports:
     - name: https
diff --git a/helm/olmv1/templates/28-persistentvolumeclaim-olmv1-system-e2e-coverage.yml b/helm/olmv1/templates/28-persistentvolumeclaim-olmv1-system-e2e-coverage.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: e2e
     {{- include "olmv1.labels" . | nindent 4 }}
   name: e2e-coverage
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml b/helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-controller-manager
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   minReadySeconds: 5
   replicas: 1
@@ -45,7 +45,7 @@ spec:
         - args:
             - --leader-elect
             - --metrics-bind-address=:7443
-            - --external-address=catalogd-service.{{ .Values.namespaces.olmv1 }}.svc
+            - --external-address=catalogd-service.{{ .Values.namespaces.olmv1.name }}.svc
             {{- if .Values.features.apiV1MetasHandler.enabled }}
             - --feature-gates=APIV1MetasHandler=true
             {{- end }}
@@ -92,11 +92,16 @@ spec:
               name: cache
             - mountPath: /tmp
               name: tmp
+            {{- if .Values.components.certManager.enabled }}
             - mountPath: /var/certs
               name: catalogserver-certs
             - mountPath: /var/ca-certs/
               name: olmv1-certificate
               readOnly: true
+            {{- end }}
+            {{- with .Values.components.catalogd.volumeMounts }}
+              {{- toYaml . | nindent }}
+            {{- end }}
       {{- with .Values.podSecurityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
@@ -113,6 +118,7 @@ spec:
           name: cache
         - emptyDir: {}
           name: tmp
+        {{- if .Values.components.certManager.enabled }}
         - name: catalogserver-certs
           secret:
             secretName: catalogd-service-cert-git-version
@@ -123,4 +129,20 @@ spec:
                 path: olm-ca.crt
             optional: false
             secretName: catalogd-service-cert-git-version
+        {{- end }}
+        {{- with .Values.components.catalogd.volumes }}
+          {{- toYaml . | indent 8 }}
+        {{- end }}
+      {{- with .Values.components.catalogd.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.components.catalogd.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.components.catalogd.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml b/helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-controller-manager
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   replicas: 1
   selector:
@@ -104,9 +104,14 @@ spec:
               name: cache
             - mountPath: /tmp
               name: tmp
+            {{- if .Values.components.certManager.enabled }}
             - mountPath: /var/certs/
               name: olmv1-certificate
               readOnly: true
+            {{- end }}
+            {{- with .Values.components.operatorController.volumeMounts }}
+              {{- toYaml . | nindent }}
+            {{- end }}
       {{- with .Values.podSecurityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
@@ -126,6 +131,7 @@ spec:
           name: cache
         - emptyDir: {}
           name: tmp
+        {{- if .Values.components.certManager.enabled }}
         - name: olmv1-certificate
           secret:
             items:
@@ -137,4 +143,20 @@ spec:
                 path: tls.key
             optional: false
             secretName: olmv1-cert
+        {{- end }}
+        {{- with .Values.components.operatorController.volumes }}
+          {{- toYaml . | indent 8 }}
+        {{- end }}
+      {{- with .Values.components.operatorController.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.components.operatorController.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.components.operatorController.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/helm/olmv1/templates/31-certificate-cert-manager-olmv1-ca.yml b/helm/olmv1/templates/31-certificate-cert-manager-olmv1-ca.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: olmv1
     {{- include "olmv1.labels" . | nindent 4 }}
   name: olmv1-ca
-  namespace: {{ .Values.namespaces.certManager }}
+  namespace: {{ .Values.namespaces.certManager.name }}
 spec:
   commonName: olmv1-ca
   isCA: true
diff --git a/helm/olmv1/templates/32-certificate-olmv1-system-catalogd-service-cert.yml b/helm/olmv1/templates/32-certificate-olmv1-system-catalogd-service-cert.yml
@@ -8,12 +8,12 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-service-cert
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   dnsNames:
     - localhost
-    - catalogd-service.{{ .Values.namespaces.olmv1 }}.svc
-    - catalogd-service.{{ .Values.namespaces.olmv1 }}.svc.cluster.local
+    - catalogd-service.{{ .Values.namespaces.olmv1.name }}.svc
+    - catalogd-service.{{ .Values.namespaces.olmv1.name }}.svc.cluster.local
   issuerRef:
     group: cert-manager.io
     kind: ClusterIssuer
diff --git a/helm/olmv1/templates/33-certificate-olmv1-system-olmv1-cert.yml b/helm/olmv1/templates/33-certificate-olmv1-system-olmv1-cert.yml
@@ -8,11 +8,11 @@ metadata:
     app.kubernetes.io/name: olmv1
     {{- include "olmv1.labels" . | nindent 4 }}
   name: olmv1-cert
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   dnsNames:
-    - operator-controller-service.{{ .Values.namespaces.olmv1 }}.svc
-    - operator-controller-service.{{ .Values.namespaces.olmv1 }}.svc.cluster.local
+    - operator-controller-service.{{ .Values.namespaces.olmv1.name }}.svc
+    - operator-controller-service.{{ .Values.namespaces.olmv1.name }}.svc.cluster.local
   issuerRef:
     group: cert-manager.io
     kind: ClusterIssuer
diff --git a/helm/olmv1/templates/35-issuer-cert-manager-self-sign-issuer.yml b/helm/olmv1/templates/35-issuer-cert-manager-self-sign-issuer.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: olmv1
     {{- include "olmv1.labels" . | nindent 4 }}
   name: self-sign-issuer
-  namespace: {{ .Values.namespaces.certManager }}
+  namespace: {{ .Values.namespaces.certManager.name }}
 spec:
   selfSigned: {}
 {{- end }}
diff --git a/helm/olmv1/templates/36-networkpolicy-olmv1-system-catalogd-controller-manager.yml b/helm/olmv1/templates/36-networkpolicy-olmv1-system-catalogd-controller-manager.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   name: catalogd-controller-manager
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   egress:
     - {}
diff --git a/helm/olmv1/templates/37-networkpolicy-olmv1-system-default-deny-all-traffic.yml b/helm/olmv1/templates/37-networkpolicy-olmv1-system-default-deny-all-traffic.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: olmv1
     {{- include "olmv1.labels" . | nindent 4 }}
   name: default-deny-all-traffic
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   podSelector: {}
   policyTypes:
diff --git a/helm/olmv1/templates/38-networkpolicy-olmv1-system-operator-controller-controller-manager.yml b/helm/olmv1/templates/38-networkpolicy-olmv1-system-operator-controller-controller-manager.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: operator-controller
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-controller-manager
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   egress:
     - {}
diff --git a/helm/olmv1/templates/39-pod-olmv1-system-e2e-coverage-copy-pod.yml b/helm/olmv1/templates/39-pod-olmv1-system-e2e-coverage-copy-pod.yml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/name: e2e
     {{- include "olmv1.labels" . | nindent 4 }}
   name: e2e-coverage-copy-pod
-  namespace: {{ .Values.namespaces.olmv1 }}
+  namespace: {{ .Values.namespaces.olmv1.name }}
 spec:
   containers:
     - command:
diff --git a/helm/olmv1/templates/40-mutatingwebhookconfiguration-catalogd-mutating-webhook-configuration.yml b/helm/olmv1/templates/40-mutatingwebhookconfiguration-catalogd-mutating-webhook-configuration.yml
diff --git a/helm/olmv1/values.yaml b/helm/olmv1/values.yaml
