WIP: reduced cert-manifests values file

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

Author: tmshort

helm/cert-manager.yaml

@@ -4,9 +4,5 @@
 
 # List of components to include
 components:
-  catalogd:
-    webhook:
-      annotations:
-        cert-manager.io/inject-ca-from-secret: cert-manager/olmv1-ca
   certManager:
     enabled: true

helm/olmv1/templates/40-mutatingwebhookconfiguration-catalogd-mutating-webhook-configuration.yml

@@ -7,7 +7,9 @@ metadata:
     app.kubernetes.io/name: catalogd
     {{- include "olmv1.labels" . | nindent 4 }}
   annotations:
-    {{- include "olmv1.catalogd.webhook.annotations" . | nindent 4 }}
+    {{- if .Values.components.certManager.enabled }}
+    cert-manager.io/inject-ca-from-secret: cert-manager/olmv1-ca
+    {{- end }}
     {{- include "olmv1.annotations" . | nindent 4 }}
 webhooks:
   - admissionReviewVersions:

helm/olmv1/templates/_helpers.tpl

@@ -43,15 +43,6 @@ Common annoations
 olm.operatorframework.io/feature-set: {{ .Values.featureSet -}}{{- if .Values.components.e2e.enabled -}}-e2e{{- end -}}
 {{- end }}
 
-{{/*
-Annotations for Catalogd Webhooks
-*/}}
-{{- define "olmv1.catalogd.webhook.annotations" -}}
-{{- with .Values.components.catalogd.webhook.annotations }}
-{{- toYamlPretty . }}
-{{- end }}
-{{- end }}
-
 {{/*
 Insertion of additional rules for RBAC
 */}}