WIP: Update common component name

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

Author: tmshort

helm/olmv1/templates/00-namespace.yml

@@ -8,7 +8,7 @@ metadata:
       {{- toYamlPretty . | nindent 4 }}
     {{- end }}
   labels:
-    app.kubernetes.io/name: olmv1
+    app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
     pod-security.kubernetes.io/audit: {{ .Values.namespaces.olmv1.podSecurityProfile }}
     pod-security.kubernetes.io/audit-version: latest
     pod-security.kubernetes.io/enforce: {{ .Values.namespaces.olmv1.podSecurityProfile }}

helm/olmv1/templates/31-certificate-cert-manager-olmv1-ca.yml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    app.kubernetes.io/name: olmv1
+    app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
     {{- include "olmv1.labels" . | nindent 4 }}
   name: olmv1-ca
   namespace: {{ .Values.namespaces.certManager.name }}

helm/olmv1/templates/33-certificate-olmv1-system-operator-controller-cert.yml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    app.kubernetes.io/name: olmv1
+    app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
     {{- include "olmv1.labels" . | nindent 4 }}
   name: operator-controller-cert
   namespace: {{ .Values.namespaces.olmv1.name }}

helm/olmv1/templates/34-clusterissuer-olmv1-ca.yml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    app.kubernetes.io/name: olmv1
+    app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
     {{- include "olmv1.labels" . | nindent 4 }}
   name: olmv1-ca
 spec:

helm/olmv1/templates/35-issuer-cert-manager-self-sign-issuer.yml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    app.kubernetes.io/name: olmv1
+    app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
     {{- include "olmv1.labels" . | nindent 4 }}
   name: self-sign-issuer
   namespace: {{ .Values.namespaces.certManager.name }}

helm/olmv1/templates/37-networkpolicy-olmv1-system-default-deny-all-traffic.yml

@@ -5,7 +5,7 @@ metadata:
   annotations:
     {{- include "olmv1.annotations" . | nindent 4 }}
   labels:
-    app.kubernetes.io/name: olmv1
+    app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
     {{- include "olmv1.labels" . | nindent 4 }}
   name: {{ include "component.name.prefix" . -}}default-deny-all-traffic
   namespace: {{ .Values.namespaces.olmv1.name }}

helm/olmv1/templates/_helpers.tpl

@@ -52,3 +52,16 @@ Insertion of additional rules for RBAC
 {{- toYamlPretty . }}
 {{- end }}
 {{- end }}
+
+{{/*
+Returns "operator-controller", "catalogd" or "olmv1" depending on enabled components
+*/}}
+{{- define "olmv1.label.name" -}}
+{{- if (and .Values.components.operatorController.enabled (not .Values.components.catalogd.enabled)) -}}
+operator-controller
+{{- else if (and (not .Values.components.operatorController.enabled) .Values.components.catalogd.enabled) -}}
+catalogd
+{{- else -}}
+olmv1
+{{- end -}}
+{{- end -}}