Merge pull request #1257 from tchap/hostUsers

OCPBUGS-64732: lib/resourcemerge: Add support for hostUsers flag

Author: openshift-merge-bot[bot]

lib/resourcemerge/core.go

@@ -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)

lib/resourcemerge/core_test.go

@@ -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{