From 7a47ce753c99de29f35bfde2d452eb351169bf1a Mon Sep 17 00:00:00 2001
From: Enrique Llorente <ellorent@redhat.com>
Date: Wed, 14 Jun 2023 09:59:12 +0200
Subject: [PATCH] kubemacpool: Remove namespace labels

The kubemacpool project was adding restricted label to test security
context. This change remove labels altogether and configure them at CI
to test it.

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
---
 automation/check-patch.e2e-kubemacpool-functests.sh | 11 +++++++++++
 data/kubemacpool/kubemacpool.yaml                   |  3 ---
 hack/components/bump-kubemacpool.sh                 | 12 ++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/automation/check-patch.e2e-kubemacpool-functests.sh b/automation/check-patch.e2e-kubemacpool-functests.sh
index bbfca0d857..7ba605162a 100755
--- a/automation/check-patch.e2e-kubemacpool-functests.sh
+++ b/automation/check-patch.e2e-kubemacpool-functests.sh
@@ -38,6 +38,17 @@ main() {
     source automation/check-patch.setup.sh
     cd ${TMP_PROJECT_PATH}
 
+    kubectl apply -f - <<EOF
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cluster-network-addons
+  labels:
+    control-plane: mac-controller-manager
+    pod-security.kubernetes.io/enforce: restricted
+EOF
+
+
     # Spin-up ephemeral cluster with latest CNAO
     # this script also exports KUBECONFIG, and fetch $COMPONENT repository
     COMPONENT="kubemacpool" source automation/components-functests.setup.sh
diff --git a/data/kubemacpool/kubemacpool.yaml b/data/kubemacpool/kubemacpool.yaml
index d35af83ec9..f380ca5193 100644
--- a/data/kubemacpool/kubemacpool.yaml
+++ b/data/kubemacpool/kubemacpool.yaml
@@ -1,9 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  labels:
-    control-plane: mac-controller-manager
-    pod-security.kubernetes.io/enforce: restricted
   name: '{{ .Namespace }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/hack/components/bump-kubemacpool.sh b/hack/components/bump-kubemacpool.sh
index 5339a3769d..1fa36ed65c 100755
--- a/hack/components/bump-kubemacpool.sh
+++ b/hack/components/bump-kubemacpool.sh
@@ -49,12 +49,16 @@ patches:
     kind: Deployment
     name: mac-controller-manager
     namespace: system
-- path: cnao_mac-range_patch.json
+- path: cnao_mac-range_patch.yaml
   target:
     version: v1
     kind: ConfigMap
     name: mac-range-config
     namespace: system
+- path: cnao_remove-labels_patch.yaml
+  target:
+    version: v1
+    kind: Namespace
 EOF
 
     cat <<EOF > config/cnao/cnao_kubemacpool_manager_patch.yaml
@@ -116,7 +120,7 @@ EOF
   value: "{{ toYaml .Placement.Tolerations | nindent 8 }}"
 EOF
 
-    cat <<EOF > config/cnao/cnao_mac-range_patch.json
+    cat <<EOF > config/cnao/cnao_mac-range_patch.yaml
 - op: replace
   path: /data/RANGE_START
   value: "{{ .RangeStart }}"
@@ -124,6 +128,10 @@ EOF
   path: /data/RANGE_END
   value: "{{ .RangeEnd }}"
 EOF
+    cat <<EOF > config/cnao/cnao_remove-labels_patch.yaml
+- op: remove
+  path: /metadata/labels
+EOF
 
 
     (