Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Ensure windows nodes are excluded by default #628

Merged
merged 4 commits into from
Feb 21, 2023
Merged

fix: Ensure windows nodes are excluded by default #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6de059e
Ensure windows nodes are excluded by default
pmengelbert Feb 7, 2023
c83f1ef
Fix typo in helm chart
pmengelbert Feb 7, 2023
03ba822
Merge branch 'main' into investigate_windows_scheduling
sozercan Feb 18, 2023
76cb681
Merge branch 'main' into investigate_windows_scheduling
sozercan Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/manager/controller_manager_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions controllers/imagejob/imagejob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down
9 changes: 5 additions & 4 deletions manifest_staging/charts/eraser/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ runtimeConfig:
# delayOnFailure: ""
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
nodeFilter:
type: exclude # must be either exclude|include
selectors:
- eraser.sh/cleanup.filter
- kubernetes.io/os=windows
components:
collector:
enabled: true
Expand Down
1 change: 1 addition & 0 deletions manifest_staging/deploy/eraser.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ runtimeConfig:
# delayOnFailure: ""
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
nodeFilter:
type: exclude # must be either exclude|include
selectors:
- eraser.sh/cleanup.filter
- kubernetes.io/os=windows
components:
collector:
enabled: true
Expand Down