drop runlevel annotations (#204)

Fixing BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1847594 We should not sneak into the restricted space. Signed-off-by: Petr Horacek <[email protected]>
k8snetworkplumbingwg · Jun 22, 2020 · f491b8a · f491b8a
1 parent 15dba19
commit f491b8a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/config/default/manager/manager.yaml b/config/default/manager/manager.yaml
@@ -3,9 +3,9 @@ kind: Namespace
 metadata:
   labels:
     control-plane: mac-controller-manager
-    controller-tools.k8s.io: "1.0"
-    runlevel: "0"
-    openshift.io/run-level: "0"
+    # Make sure that KubeMacPool pods are never handled by the webhook to
+    # prevent dead-lock.
+    mutatepods.kubemacpool.io: ignore
   name: system
 ---
 apiVersion: v1

diff --git a/config/release/kubemacpool.yaml b/config/release/kubemacpool.yaml
@@ -3,9 +3,7 @@ kind: Namespace
 metadata:
   labels:
     control-plane: mac-controller-manager
-    controller-tools.k8s.io: "1.0"
-    openshift.io/run-level: "0"
-    runlevel: "0"
+    mutatepods.kubemacpool.io: ignore
   name: kubemacpool-system
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1

diff --git a/config/test/kubemacpool.yaml b/config/test/kubemacpool.yaml
@@ -3,9 +3,7 @@ kind: Namespace
 metadata:
   labels:
     control-plane: mac-controller-manager
-    controller-tools.k8s.io: "1.0"
-    openshift.io/run-level: "0"
-    runlevel: "0"
+    mutatepods.kubemacpool.io: ignore
   name: kubemacpool-system
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1

diff --git a/pkg/pool-manager/pool_test.go b/pkg/pool-manager/pool_test.go
@@ -402,7 +402,7 @@ var _ = Describe("Pool", func() {
 
 				By("checking the configmap is updated with mac allocated")
 				macAddressInConfigMapFormat := strings.Replace(allocatedMac, ":", "-", 5)
-				Expect(configMap.Data).To(HaveLen(1),"configmap should hold the mac address waiting for approval")
+				Expect(configMap.Data).To(HaveLen(1), "configmap should hold the mac address waiting for approval")
 				_, exist := configMap.Data[macAddressInConfigMapFormat]
 				Expect(exist).To(Equal(true), "should have an entry of the mac in the configmap")
 			})