Merge pull request #428 from vrutkovs/shareProcessNamespace

Bug 1866554: lib/resourcemerge/core: set ShareProcessNamespace, DNSConfig and TerminationGracePeriodSeconds

Author: openshift-merge-robot

lib/resourcemerge/core.go

@@ -59,6 +59,9 @@ func ensurePodSpec(modified *bool, existing *corev1.PodSpec, required corev1.Pod
 	ensureTolerations(modified, &existing.Tolerations, required.Tolerations)
 	setStringIfSet(modified, &existing.PriorityClassName, required.PriorityClassName)
 	setInt32Ptr(modified, &existing.Priority, required.Priority)
+	setBoolPtr(modified, &existing.ShareProcessNamespace, required.ShareProcessNamespace)
+	ensureDNSPolicy(modified, &existing.DNSPolicy, required.DNSPolicy)
+	setInt64Ptr(modified, &existing.TerminationGracePeriodSeconds, required.TerminationGracePeriodSeconds)
 }
 
 func ensureContainers(modified *bool, existing *[]corev1.Container, required []corev1.Container) {
@@ -519,6 +522,13 @@ func ensureResourceList(modified *bool, existing *corev1.ResourceList, required
 	}
 }
 
+func ensureDNSPolicy(modified *bool, existing *corev1.DNSPolicy, required corev1.DNSPolicy) {
+	if !equality.Semantic.DeepEqual(required, *existing) {
+		*modified = true
+		*existing = required
+	}
+}
+
 func setBool(modified *bool, existing *bool, required bool) {
 	if required != *existing {
 		*existing = required