WIP: Add podAnnotations

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

Author: tmshort

helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml

@@ -22,8 +22,12 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         {{- include "olmv1.annotations" . | nindent 8 }}
+        {{- with .Values.components.catalogd.deployment.podAnnotations }}
+        {{- toYamlPretty . | nindent 8 }}
+        {{- end }}
       labels:
         control-plane: catalogd-controller-manager
+        app.kubernetes.io/name: catalogd
         {{- include "olmv1.labels" . | nindent 8 }}
         {{- with .Values.components.catalogd.deployment.podLabels }}
         {{- toYamlPretty . | nindent 8 }}

helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml

@@ -21,8 +21,12 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: manager
         {{- include "olmv1.annotations" . | nindent 8 }}
+        {{- with .Values.components.operatorController.deployment.podAnnotations }}
+        {{- toYamlPretty . | nindent 8 }}
+        {{- end }}
       labels:
         control-plane: operator-controller-controller-manager
+        app.kubernetes.io/name: operator-controller
         {{- include "olmv1.labels" . | nindent 8 }}
         {{- with .Values.components.operatorController.deployment.podLabels }}
         {{- toYamlPretty . | nindent 8 }}

helm/olmv1/values.yaml

@@ -16,6 +16,7 @@ components:
       tolerations: []
       podArguments: []
       podLabels: {}
+      podAnnotations: {}
       priorityClassName: ""
       env: []
     service:
@@ -36,6 +37,7 @@ components:
       tolerations: []
       podArguments: []
       podLabels: {}
+      podAnnotations: {}
       priorityClassName: ""
       env: []
     service:

manifests/experimental-e2e.yaml

@@ -1898,6 +1898,7 @@ spec:
         olm.operatorframework.io/feature-set: experimental-e2e
       labels:
         control-plane: catalogd-controller-manager
+        app.kubernetes.io/name: catalogd
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"
@@ -2026,6 +2027,7 @@ spec:
         olm.operatorframework.io/feature-set: experimental-e2e
       labels:
         control-plane: operator-controller-controller-manager
+        app.kubernetes.io/name: operator-controller
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"

manifests/experimental.yaml

@@ -1811,6 +1811,7 @@ spec:
         olm.operatorframework.io/feature-set: experimental
       labels:
         control-plane: catalogd-controller-manager
+        app.kubernetes.io/name: catalogd
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"
@@ -1931,6 +1932,7 @@ spec:
         olm.operatorframework.io/feature-set: experimental
       labels:
         control-plane: operator-controller-controller-manager
+        app.kubernetes.io/name: operator-controller
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"

manifests/standard-e2e.yaml

@@ -1898,6 +1898,7 @@ spec:
         olm.operatorframework.io/feature-set: standard-e2e
       labels:
         control-plane: catalogd-controller-manager
+        app.kubernetes.io/name: catalogd
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"
@@ -2025,6 +2026,7 @@ spec:
         olm.operatorframework.io/feature-set: standard-e2e
       labels:
         control-plane: operator-controller-controller-manager
+        app.kubernetes.io/name: operator-controller
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"

manifests/standard.yaml

@@ -1811,6 +1811,7 @@ spec:
         olm.operatorframework.io/feature-set: standard
       labels:
         control-plane: catalogd-controller-manager
+        app.kubernetes.io/name: catalogd
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"
@@ -1930,6 +1931,7 @@ spec:
         olm.operatorframework.io/feature-set: standard
       labels:
         control-plane: operator-controller-controller-manager
+        app.kubernetes.io/name: operator-controller
         helm.sh/chart: olmv1-0.1.0
         app.kubernetes.io/instance: olmv1
         app.kubernetes.io/version: "1.3.0"