Skip to content

Bug 1869523: Fix nodeSelector subscription config override #1728

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

Merged
merged 1 commit into from
Aug 19, 2020
Merged

Bug 1869523: Fix nodeSelector subscription config override #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion pkg/controller/operators/olm/overrides/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ func InjectNodeSelectorIntoDeployment(podSpec *corev1.PodSpec, nodeSelector map[
return errors.New("no pod spec provided")
}

podSpec.NodeSelector = nodeSelector
if nodeSelector != nil {
podSpec.NodeSelector = nodeSelector
}

return nil
}
24 changes: 24 additions & 0 deletions pkg/controller/operators/olm/overrides/inject_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,30 @@ func TestInjectNodeSelectorIntoDeployment(t *testing.T) {
NodeSelector: map[string]string{"foo": "bar"},
},
},
{
// Existing PodSpec is left alone if nodeSelector is nil
// Expected: PodSpec is not changed
name: "WithNilNodeSelector",
podSpec: &corev1.PodSpec{
NodeSelector: defaultNodeSelector,
},
nodeSelector: nil,
expected: &corev1.PodSpec{
NodeSelector: defaultNodeSelector,
},
},
{
// Existing PodSpec is set to an empty map if the nodeSelector is an empty map
// Expected: PodSpec nodeSelector is set to an empty map
name: "WithEmptyNodeSelector",
podSpec: &corev1.PodSpec{
NodeSelector: defaultNodeSelector,
},
nodeSelector: map[string]string{},
expected: &corev1.PodSpec{
NodeSelector: map[string]string{},
},
},
}

for _, tt := range tests {
Expand Down