WIP: Update values locations; add build of tilt

tmshort · tmshort · commit 99c9c7660b48 · 2025-07-30T16:12:24.000-04:00
Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/Makefile b/Makefile
@@ -157,6 +157,7 @@ manifests: $(CONTROLLER_GEN) $(HELM) #EXHELP Generate WebhookConfiguration, Clus
 	$(HELM) template olmv1 helm/olmv1 --values helm/cert-manager.yaml --values helm/e2e.yaml > $(STANDARD_E2E_MANIFEST)
 	$(HELM) template olmv1 helm/olmv1 --values helm/cert-manager.yaml --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST)
 	$(HELM) template olmv1 helm/olmv1 --values helm/cert-manager.yaml --values helm/experimental.yaml --values helm/e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
+	$(HELM) template olmv1 helm/olmv1 --values helm/tilt.yaml > /dev/null
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
diff --git a/helm/cert-manager.yaml b/helm/cert-manager.yaml
@@ -3,6 +3,6 @@
 # Declare variables to be passed into your templates.
 
 # List of components to include
-components:
+options:
   certManager:
     enabled: true
diff --git a/helm/e2e.yaml b/helm/e2e.yaml
@@ -3,6 +3,6 @@
 # Declare variables to be passed into your templates.
 
 # List of components to include
-components:
+options:
   e2e:
     enabled: true
diff --git a/helm/experimental.yaml b/helm/experimental.yaml
@@ -18,4 +18,5 @@ catalogdFeatures:
   - APIV1MetasHandler
 
 # This can be one of: standard or experimental
-featureSet: experimental
+options:
+  featureSet: experimental
diff --git a/helm/olmv1/templates/01-customresourcedefinition-clustercatalogs.olm.operatorframework.io.yml b/helm/olmv1/templates/01-customresourcedefinition-clustercatalogs.olm.operatorframework.io.yml
@@ -1,7 +1,7 @@
-{{- if .Values.components.catalogd.enabled }}
-{{- if (eq .Values.featureSet "standard") }}
+{{- if .Values.options.catalogd.enabled }}
+{{- if (eq .Values.options.featureSet "standard") }}
 {{ tpl (.Files.Get "base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml") . }}
-{{- else if (eq .Values.featureSet "experimental") }}
+{{- else if (eq .Values.options.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml") . }}
 {{- end }}
 {{- end }}
diff --git a/helm/olmv1/templates/02-customresourcedefinition-clusterextensions.olm.operatorframework.io.yml b/helm/olmv1/templates/02-customresourcedefinition-clusterextensions.olm.operatorframework.io.yml
@@ -1,7 +1,7 @@
-{{- if .Values.components.operatorController.enabled }}
-{{- if (eq .Values.featureSet "standard") }}
+{{- if .Values.options.operatorController.enabled }}
+{{- if (eq .Values.options.featureSet "standard") }}
 {{ tpl (.Files.Get "base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml") . }}
-{{- else if (eq .Values.featureSet "experimental") }}
+{{- else if (eq .Values.options.featureSet "experimental") }}
 {{ tpl (.Files.Get "base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml") . }}
 {{- end }}
 {{- end }}
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/helm/olmv1/templates/09-clusterrole-catalogd-manager-role.yml b/helm/olmv1/templates/09-clusterrole-catalogd-manager-role.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/helm/olmv1/templates/10-clusterrole-catalogd-metrics-reader.yml b/helm/olmv1/templates/10-clusterrole-catalogd-metrics-reader.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/helm/olmv1/templates/11-clusterrole-catalogd-proxy-role.yml b/helm/olmv1/templates/11-clusterrole-catalogd-proxy-role.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/helm/olmv1/templates/12-clusterrole-operator-controller-clusterextension-editor-role.yml b/helm/olmv1/templates/12-clusterrole-operator-controller-clusterextension-editor-role.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/helm/olmv1/templates/13-clusterrole-operator-controller-clusterextension-viewer-role.yml b/helm/olmv1/templates/13-clusterrole-operator-controller-clusterextension-viewer-role.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/helm/olmv1/templates/14-clusterrole-operator-controller-manager-role.yml b/helm/olmv1/templates/14-clusterrole-operator-controller-manager-role.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
diff --git a/helm/olmv1/templates/15-clusterrole-operator-controller-metrics-reader.yml b/helm/olmv1/templates/15-clusterrole-operator-controller-metrics-reader.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
diff --git a/helm/olmv1/templates/16-clusterrole-operator-controller-proxy-role.yml b/helm/olmv1/templates/16-clusterrole-operator-controller-proxy-role.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/helm/olmv1/templates/21-clusterrolebinding-catalogd-manager-rolebinding.yml b/helm/olmv1/templates/21-clusterrolebinding-catalogd-manager-rolebinding.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/helm/olmv1/templates/22-clusterrolebinding-catalogd-proxy-rolebinding.yml b/helm/olmv1/templates/22-clusterrolebinding-catalogd-proxy-rolebinding.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/helm/olmv1/templates/23-clusterrolebinding-operator-controller-manager-rolebinding.yml b/helm/olmv1/templates/23-clusterrolebinding-operator-controller-manager-rolebinding.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/helm/olmv1/templates/24-clusterrolebinding-operator-controller-proxy-rolebinding.yml b/helm/olmv1/templates/24-clusterrolebinding-operator-controller-proxy-rolebinding.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 {{/* Probably want to include this as a file somehow */}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.e2e.enabled }}
+{{- if .Values.options.e2e.enabled }}
 apiVersion: v1
 data:
   registries.conf: |
diff --git a/helm/olmv1/templates/26-service-olmv1-system-catalogd-service.yml b/helm/olmv1/templates/26-service-olmv1-system-catalogd-service.yml
@@ -1,10 +1,10 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
-    {{- with .Values.components.catalogd.service.annotations }}
+    {{- with .Values.options.catalogd.service.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   labels:
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
@@ -1,10 +1,10 @@
-{{- if .Values.components.operatorController.enabled }}
+{{- if .Values.options.operatorController.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
-    {{- with .Values.components.operatorController.service.annotations }}
+    {{- with .Values.options.operatorController.service.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   labels:
diff --git a/helm/olmv1/templates/28-persistentvolumeclaim-olmv1-system-e2e-coverage.yml b/helm/olmv1/templates/28-persistentvolumeclaim-olmv1-system-e2e-coverage.yml
@@ -1,4 +1,4 @@
-{{- if .Values.components.e2e.enabled }}
+{{- if .Values.options.e2e.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
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
@@ -1,4 +1,4 @@
-{{- if .Values.components.catalogd.enabled }}
+{{- if .Values.options.catalogd.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -21,49 +21,49 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         {{- include "olmv1.annotations" . | nindent 8 }}
-        {{- with .Values.components.catalogd.deployment.podAnnotations }}
+        {{- with .Values.options.catalogd.deployment.podAnnotations }}
         {{- toYamlPretty . | nindent 8 }}
         {{- end }}
       labels:
         app.kubernetes.io/name: catalogd
         control-plane: catalogd-controller-manager
         {{- include "olmv1.labels" . | nindent 8 }}
-        {{- with .Values.components.catalogd.deployment.podLabels }}
+        {{- with .Values.options.catalogd.deployment.podLabels }}
         {{- toYamlPretty . | nindent 8 }}
         {{- end }}
     spec:
       containers:
         - args:
-            {{- if not .Values.tilt.enabled }}
+            {{- if not .Values.options.tilt.enabled }}
             - --leader-elect
             {{- end }}
             - --metrics-bind-address=:7443
             - --external-address=catalogd-service.{{ .Values.namespaces.olmv1.name }}.svc
             {{- range .Values.catalogdFeatures }}
             - --feature-gates={{- . -}}=true
             {{- end }}
-            {{- if .Values.components.certManager.enabled }}
+            {{- if .Values.options.certManager.enabled }}
             - --tls-cert=/var/certs/tls.crt
             - --tls-key=/var/certs/tls.key
             - --pull-cas-dir=/var/ca-certs
             {{- end }}
-            {{- with .Values.components.catalogd.deployment.podArguments }}
+            {{- with .Values.options.catalogd.deployment.podArguments }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
           command:
             - ./catalogd
-          {{- if or .Values.components.e2e.enabled .Values.components.catalogd.deployment.env }}
+          {{- if or .Values.options.e2e.enabled .Values.options.catalogd.deployment.env }}
           env:
           {{- end }}
-          {{- if .Values.components.e2e.enabled }}
+          {{- if .Values.options.e2e.enabled }}
             - name: GOCOVERDIR
               value: /e2e-coverage
           {{- end }}
-          {{- with .Values.components.catalogd.deployment.env }}
+          {{- with .Values.options.catalogd.deployment.env }}
           {{- toYamlPretty . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.components.catalogd.deployment.image }}"
-          {{- if not .Values.tilt.enabled }}
+          image: "{{ .Values.options.catalogd.deployment.image }}"
+          {{- if not .Values.options.tilt.enabled }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -72,7 +72,7 @@ spec:
             periodSeconds: 20
           {{- end }}
           name: manager
-          {{- if not .Values.tilt.enabled }}
+          {{- if not .Values.options.tilt.enabled }}
           readinessProbe:
             httpGet:
               path: /readyz
@@ -85,30 +85,30 @@ spec:
               cpu: 100m
               memory: 200Mi
           volumeMounts:
-            {{- if .Values.components.e2e.enabled }}
+            {{- if .Values.options.e2e.enabled }}
             - mountPath: /e2e-coverage
               name: e2e-coverage-volume
             {{- end }}
             - mountPath: /var/cache/
               name: cache
             - mountPath: /tmp
               name: tmp
-            {{- if .Values.components.certManager.enabled }}
+            {{- if .Values.options.certManager.enabled }}
             - mountPath: /var/certs
               name: catalogserver-certs
             - mountPath: /var/ca-certs
               name: ca-certs
               readOnly: true
             {{- end }}
-            {{- with .Values.components.catalogd.deployment.volumeMounts }}
+            {{- with .Values.options.catalogd.deployment.volumeMounts }}
               {{- toYamlPretty . | nindent 12 }}
             {{- end }}
           {{- with .Values.deployments.containerSpec }}
           {{- toYamlPretty . | nindent 10 }}
           {{- end }}
       serviceAccountName: catalogd-controller-manager
       volumes:
-        {{- if .Values.components.e2e.enabled }}
+        {{- if .Values.options.e2e.enabled }}
         - name: e2e-coverage-volume
           persistentVolumeClaim:
             claimName: e2e-coverage
@@ -117,7 +117,7 @@ spec:
           name: cache
         - emptyDir: {}
           name: tmp
-        {{- if .Values.components.certManager.enabled }}
+        {{- if .Values.options.certManager.enabled }}
         - name: catalogserver-certs
           secret:
             items:
@@ -135,7 +135,7 @@ spec:
             optional: false
             secretName: catalogd-service-cert-git-version
         {{- end }}
-        {{- with .Values.components.catalogd.deployment.volumes }}
+        {{- with .Values.options.catalogd.deployment.volumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with .Values.deployments.templateSpec }}
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
diff --git a/helm/olmv1/templates/31-certificate-cert-manager-olmv1-ca.yml b/helm/olmv1/templates/31-certificate-cert-manager-olmv1-ca.yml
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
diff --git a/helm/olmv1/templates/33-certificate-olmv1-system-operator-controller-cert.yml b/helm/olmv1/templates/33-certificate-olmv1-system-operator-controller-cert.yml
diff --git a/helm/olmv1/templates/34-clusterissuer-olmv1-ca.yml b/helm/olmv1/templates/34-clusterissuer-olmv1-ca.yml
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
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
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
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
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/templates/_helpers.tpl b/helm/olmv1/templates/_helpers.tpl
diff --git a/helm/olmv1/values.yaml b/helm/olmv1/values.yaml
diff --git a/helm/tilt.yaml b/helm/tilt.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.components.catalogd.enabled }}`
	`1`	`+{{- if .Values.options.catalogd.enabled }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: ServiceAccount`
`4`	`4`	`metadata:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if .Values.components.operatorController.enabled }}`
	`1`	`+{{- if .Values.options.operatorController.enabled }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: ServiceAccount`
`4`	`4`	`metadata:`