Add customer namespace labels per operator (redhat-cop#655)

* Add namespace label
* Bump operators-installer version to 3.3
* Add test-install-operator-with-namespace-labels.yaml

Author: jianzzha

charts/operators-installer/Chart.yaml

@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.2.4
+version: 3.3.0
 
 home: https://github.com/redhat-cop/helm-charts
 

charts/operators-installer/README.md

@@ -39,6 +39,7 @@ For all of the Subscription parameters see
 | operatorGroups                               | `[]`          | No        | Optional list of configuration for OperatorGroups. If this is not supplied then it is assumed OperatorGroups are already in place in the selected `operators[].namespace`s.
 | operatorGroups[].name                        | `.Release.Namespace` | No | Name of the OperatorGroup & Namespace the OperatorGroup will be placed in.
 | operatorGroups[].createNamespace             | `false`       | No        | If `true` create the Namespace of the same name of the OperatorGroup. If `false` assumed the Namespace is already in place.
+| operatorGroups[].namespaceLabels             | `{}`          | No        | Labels to add to the created OperatorGroup namespace.
 | operatorGroups[].targetOwnNamespace          | `false`       | No        | If `true` add the OperatorGroup's Namespace as a `targetNamespaces`. If `true` then OperatorGroup will only work for Operators using `OwnNamespace` or `MultiNamespace` `installModes`. If blank and no `otherTargetNamespaces` specified then OperatorGroup will be configured to allow for operators using `installModes` `AllNamespaces`.
 | operatorGroups[].otherTargetNamespaces       | `[]`          | No        | List of additional Namespaces to target. If specified OperatorGroup will only work for operators using `SingleNamespace` or `MultiNamespace` `installModes` depending on value of `targetOwnNamespace`.
 | installPlanApproverAndVerifyJobsImage        | `registry.redhat.io/openshift4/ose-cli:v4.10` | Yes | Image to use for the InstallPlan Approver and Verify Jobs

charts/operators-installer/ci/test-install-operator-with-namespace-labels.yaml

@@ -0,0 +1,22 @@
+approveManualInstallPlanViaHook: true
+
+installPlanApproverAndVerifyJobsImage: quay.io/openshift/origin-cli:4.15
+
+operators:
+- name: argocd-operator
+  channel: alpha
+  csv: argocd-operator.v0.6.0
+  installPlanApproval: Manual
+  source: operatorhubio-catalog
+  sourceNamespace: olm
+  namespace: argocd-operator-with-namespace-labels
+  installPlanVerifierActiveDeadlineSeconds: 1200
+operatorGroups:
+- name: argocd-operator-with-namespace-labels
+  createNamespace: true
+  targetOwnNamespace: true
+  otherTargetNamespaces:
+  namespaceLabels:
+    pod-security.kubernetes.io/audit: privileged
+    pod-security.kubernetes.io/enforce: privileged
+    pod-security.kubernetes.io/warn: privileged

charts/operators-installer/templates/Namespace.yaml

@@ -7,6 +7,9 @@ metadata:
   name: {{ .name | default $.Release.Namespace }}
   labels:
     {{- include "operators-installer.labels" $ | nindent 4 }}
+    {{- if $operatorGroup.namespaceLabels }}
+{{ toYaml $operatorGroup.namespaceLabels | indent 4 }}
+    {{- end }}
   annotations:
     argocd.argoproj.io/sync-wave: "-60"
 {{- end }}