WIP: fix webhook annotations

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

Author: tmshort

Makefile

@@ -163,10 +163,10 @@ manifests: $(CONTROLLER_GEN) $(HELM) #EXHELP Generate WebhookConfiguration, Clus
 	./hack/tools/patch-base-for-helm.sh
 	# Generate manifests stored in source-control
 	mkdir -p $(MANIFEST_HOME)
-	$(HELM) template olmv1 helm/olmv1 > $(STANDARD_MANIFEST)
-	$(HELM) template olmv1 helm/olmv1 --values helm/e2e.yaml > $(STANDARD_E2E_MANIFEST)
-	$(HELM) template olmv1 helm/olmv1 --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST)
-	$(HELM) template olmv1 helm/olmv1 --values helm/experimental.yaml --values helm/e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
+	$(HELM) template olmv1 helm/olmv1 --values helm/standard.yaml > $(STANDARD_MANIFEST)
+	$(HELM) template olmv1 helm/olmv1 --values helm/standard.yaml --values helm/e2e.yaml > $(STANDARD_E2E_MANIFEST)
+	$(HELM) template olmv1 helm/olmv1 --values helm/standard.yaml --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST)
+	$(HELM) template olmv1 helm/olmv1 --values helm/standard.yaml --values helm/experimental.yaml --values helm/e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

helm/olmv1/templates/_helpers.tpl

@@ -47,7 +47,9 @@ olm.operatorframework.io/feature-set: {{ .Values.featureSet -}}{{- if .Values.co
 Annotations for Catalogd Webhooks
 */}}
 {{- define "olmv1.catalogd.webhook.annotations" -}}
-cert-manager.io/inject-ca-from-secret: cert-manager/olmv1-ca
+{{- with .Values.components.catalogd.webhook.annotations }}
+{{- toYamlPretty . }}
+{{- end }}
 {{- end }}
 
 {{/*

helm/olmv1/values.yaml

@@ -47,8 +47,7 @@ components:
     role:
       rules: []
     webhook:
-      annotations:
-        cert-manager.io/inject-ca-from-secret: cert-manager/olmv1-ca
+      annotations: {}
   certManager:
     enabled: true
   e2e:

helm/standard.yaml

@@ -0,0 +1,10 @@
+# Default values for OLMv1.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# List of components to include
+components:
+  catalogd:
+    webhook:
+      annotations:
+        cert-manager.io/inject-ca-from-secret: cert-manager/olmv1-ca