Skip to content

[release-4.20] OCPBUGS-64828: lib/resourcemerge: Add support for hostUsers flag #1259

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

Open
wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPBUGS-64828: lib/resourcemerge: Add support for hostUsers flag #1259

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
1 change: 1 addition & 0 deletions lib/resourcemerge/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func ensurePodSpec(modified *bool, existing *corev1.PodSpec, required corev1.Pod

setStringIfSet(modified, &existing.ServiceAccountName, required.ServiceAccountName)
setBool(modified, &existing.HostNetwork, required.HostNetwork)
setBoolPtr(modified, &existing.HostUsers, required.HostUsers)
mergeMap(modified, &existing.NodeSelector, required.NodeSelector)
ensurePodSecurityContextPtr(modified, &existing.SecurityContext, required.SecurityContext)
ensureAffinityPtr(modified, &existing.Affinity, required.Affinity)
Expand Down
11 changes: 11 additions & 0 deletions lib/resourcemerge/core_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@ func TestEnsurePodSpec(t *testing.T) {
Containers: []corev1.Container{
{Name: "test"}}},
},
{
name: "hostUsers flag is set",
existing: corev1.PodSpec{},
input: corev1.PodSpec{
HostUsers: boolPtr(false),
},
expectedModified: true,
expected: corev1.PodSpec{
HostUsers: boolPtr(false),
},
},
{
name: "PodSecurityContext empty",
existing: corev1.PodSpec{
Expand Down