Manage the addon namespace for OpenShift monitoring configuration

Previously, only non-default namespace would get the
openshift.io/cluster-monitoring label if Prometheus was enabled and it
was OpenShift. Now this also gets set on the default namespace name.

Relates:
https://issues.redhat.com/browse/ACM-7675
https://issues.redhat.com/browse/ACM-7633

Signed-off-by: mprahl <[email protected]>

Author: mprahl

pkg/addon/configpolicy/manifests/managedclusterchart/templates/install-namespace.yaml

@@ -1,18 +1,17 @@
 # Copyright Contributors to the Open Cluster Management project
-
-{{- if ne .Release.Namespace "open-cluster-management-agent-addon" }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Release.Namespace }}
   labels:
+    {{- if ne .Release.Namespace "open-cluster-management-agent-addon" }}
     addon.open-cluster-management.io/namespace: "true"
     addon.open-cluster-management.io/hosted-manifest-location: hosting
+    {{- end }}
     {{- if and .Values.prometheus.enabled (eq .Values.kubernetesDistribution "OpenShift") }}
     openshift.io/cluster-monitoring: "true"
     {{- end }}
-  {{- if eq (.Release.Namespace | trimPrefix "klusterlet-") .Values.clusterName }}
+  {{- if or (eq .Release.Namespace "open-cluster-management-agent-addon") (eq (.Release.Namespace | trimPrefix "klusterlet-") .Values.clusterName) }}
   annotations:
     "addon.open-cluster-management.io/deletion-orphan": ""
   {{- end }}
-{{- end }}

pkg/addon/policyframework/manifests/managedclusterchart/templates/install-namespace.yaml

@@ -1,18 +1,17 @@
 # Copyright Contributors to the Open Cluster Management project
-
-{{- if ne .Release.Namespace "open-cluster-management-agent-addon" }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Release.Namespace }}
   labels:
+    {{- if ne .Release.Namespace "open-cluster-management-agent-addon" }}
     addon.open-cluster-management.io/namespace: "true"
     addon.open-cluster-management.io/hosted-manifest-location: hosting
+    {{- end }}
     {{- if and .Values.prometheus.enabled (eq .Values.kubernetesDistribution "OpenShift") }}
     openshift.io/cluster-monitoring: "true"
     {{- end }}
-  {{- if eq (.Release.Namespace | trimPrefix "klusterlet-") .Values.clusterName }}
+  {{- if or (eq .Release.Namespace "open-cluster-management-agent-addon") (eq (.Release.Namespace | trimPrefix "klusterlet-") .Values.clusterName) }}
   annotations:
     "addon.open-cluster-management.io/deletion-orphan": ""
   {{- end }}
-{{- end }}

test/e2e/case2_config_deployment_test.go

@@ -16,15 +16,14 @@ import (
 )
 
 const (
-	case2ManagedClusterAddOnName       string = "config-policy-controller"
-	case2ManagedClusterAddOnCR         string = "../resources/config_policy_addon_cr.yaml"
-	case2ManagedClusterCustomNsAddOnCR string = "../resources/config_policy_addon_custom_ns.yaml"
-	case2ClusterManagementAddOnCR      string = "../resources/config_policy_clustermanagementaddon.yaml"
-	case2DeploymentName                string = "config-policy-controller"
-	case2PodSelector                   string = "app=config-policy-controller"
-	case2OpenShiftClusterClaim         string = "../resources/openshift_cluster_claim.yaml"
-	policyCrdName                      string = "policies.policy.open-cluster-management.io"
-	deletionOrphanAnnotationKey        string = "addon.open-cluster-management.io/deletion-orphan"
+	case2ManagedClusterAddOnName  string = "config-policy-controller"
+	case2ManagedClusterAddOnCR    string = "../resources/config_policy_addon_cr.yaml"
+	case2ClusterManagementAddOnCR string = "../resources/config_policy_clustermanagementaddon.yaml"
+	case2DeploymentName           string = "config-policy-controller"
+	case2PodSelector              string = "app=config-policy-controller"
+	case2OpenShiftClusterClaim    string = "../resources/openshift_cluster_claim.yaml"
+	policyCrdName                 string = "policies.policy.open-cluster-management.io"
+	deletionOrphanAnnotationKey   string = "addon.open-cluster-management.io/deletion-orphan"
 )
 
 func verifyConfigPolicyDeployment(
@@ -406,8 +405,6 @@ var _ = Describe("Test config-policy-controller deployment", func() {
 	It("should create a config-policy-controller deployment with metrics monitoring on OpenShift clusters", func() {
 		Expect(managedClusterList).ToNot(BeEmpty())
 		hubClient := managedClusterList[0].clusterClient
-		// A custom namespace is used to see if the openshift.io/cluster-monitoring label is set.
-		addonNamespace := "e2e-test-config-policy-controller"
 
 		for i, cluster := range managedClusterList {
 			logPrefix := cluster.clusterType + " " + cluster.clusterName + ": "
@@ -446,7 +443,7 @@ var _ = Describe("Test config-policy-controller deployment", func() {
 			// The status doesn't need to be checked on the deployment because the deployment requires a cert that
 			// is auto-generated by OpenShift, which won't be present.
 			By(logPrefix + "deploying the default config-policy-controller managedclusteraddon")
-			Kubectl("apply", "-n", cluster.clusterName, "-f", case2ManagedClusterCustomNsAddOnCR)
+			Kubectl("apply", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR)
 			deploy := GetWithTimeout(
 				cluster.clusterClient, gvrDeployment, case2DeploymentName, addonNamespace, true, 30,
 			)