Ensure windows nodes are excluded by default

Signed-off-by: Peter Engelbert <pmengelbert@gmail.com>
eraser-dev · Feb 7, 2023 · fce64ac · fce64ac
1 parent b933a66
commit fce64ac
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
@@ -21,6 +21,7 @@ manager:
     type: exclude # must be either exclude|include
     selectors:
       - eraser.sh/cleanup.filter
+      - kubernetes.io/os=windows
 components:
   collector:
     enabled: true

diff --git a/controllers/imagejob/imagejob_controller.go b/controllers/imagejob/imagejob_controller.go
@@ -63,16 +63,6 @@ var defaultTolerations = []corev1.Toleration{
 }
 
 func Add(mgr manager.Manager, cfg *config.Manager) error {
-	c, err := cfg.Read()
-	if err != nil {
-		return err
-	}
-
-	filterOpts := c.Manager.NodeFilter
-	if filterOpts.Type == "exclude" && !slices.Contains(filterOpts.Selectors, windowsFilterLabel) {
-		filterOpts.Selectors = append(filterOpts.Selectors, windowsFilterLabel)
-	}
-
 	return add(mgr, newReconciler(mgr, cfg))
 }
 

diff --git a/manifest_staging/charts/eraser/values.yaml b/manifest_staging/charts/eraser/values.yaml
@@ -26,9 +26,10 @@ runtimeConfig:
     pullSecrets: [] # image pull secrets for collector/scanner/eraser
     priorityClassName: "" # priority class name for collector/scanner/eraser
     nodeFilter: {}
-      # type: exclude # must be either exclude|include
-      # selectors:
-      #   - eraser.sh/cleanup.filter
+      type: exclude # must be either exclude|include
+      selectors:
+        - eraser.sh/cleanup.filter
+        - kubernetes.io/os=windows
   components:
     collector:
       enabled: true

diff --git a/manifest_staging/deploy/eraser.yaml b/manifest_staging/deploy/eraser.yaml
@@ -453,6 +453,7 @@ data:
         type: exclude # must be either exclude|include
         selectors:
           - eraser.sh/cleanup.filter
+          - kubernetes.io/os=windows
     components:
       collector:
         enabled: true

diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml b/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml
@@ -26,9 +26,10 @@ runtimeConfig:
     pullSecrets: [] # image pull secrets for collector/scanner/eraser
     priorityClassName: "" # priority class name for collector/scanner/eraser
     nodeFilter: {}
-      # type: exclude # must be either exclude|include
-      # selectors:
-      #   - eraser.sh/cleanup.filter
+      type: exclude # must be either exclude|include
+      selectors:
+        - eraser.sh/cleanup.filter
+        - kubernetes.io/os=windows
   components:
     collector:
       enabled: true