lib/resourcemerge/core: set DNSPolicy

vrutkovs · vrutkovs · commit daeb275a36b4 · 2020-08-12T10:21:40.000+02:00
Ensure DNSPolicy is copied when PodSpec is being reconciled
diff --git a/lib/resourcemerge/core.go b/lib/resourcemerge/core.go
@@ -60,6 +60,7 @@ func ensurePodSpec(modified *bool, existing *corev1.PodSpec, required corev1.Pod
 	setStringIfSet(modified, &existing.PriorityClassName, required.PriorityClassName)
 	setInt32Ptr(modified, &existing.Priority, required.Priority)
 	setBoolPtr(modified, &existing.ShareProcessNamespace, required.ShareProcessNamespace)
+	ensureDNSPolicy(modified, &existing.DNSPolicy, required.DNSPolicy)
 }
 
 func ensureContainers(modified *bool, existing *[]corev1.Container, required []corev1.Container) {
@@ -520,6 +521,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

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ func ensurePodSpec(modified bool, existing corev1.PodSpec, required corev1.Pod`
`60`	`60`	`setStringIfSet(modified, &existing.PriorityClassName, required.PriorityClassName)`
`61`	`61`	`setInt32Ptr(modified, &existing.Priority, required.Priority)`
`62`	`62`	`setBoolPtr(modified, &existing.ShareProcessNamespace, required.ShareProcessNamespace)`
	`63`	`+ ensureDNSPolicy(modified, &existing.DNSPolicy, required.DNSPolicy)`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`func ensureContainers(modified bool, existing []corev1.Container, required []corev1.Container) {`
`@@ -520,6 +521,13 @@ func ensureResourceList(modified bool, existing corev1.ResourceList, required`
`520`	`521`	`}`
`521`	`522`	`}`
`522`	`523`
	`524`	`+func ensureDNSPolicy(modified bool, existing corev1.DNSPolicy, required corev1.DNSPolicy) {`
	`525`	`+ if !equality.Semantic.DeepEqual(required, *existing) {`
	`526`	`+ *modified = true`
	`527`	`+ *existing = required`
	`528`	`+ }`
	`529`	`+}`
	`530`	`+`
`523`	`531`	`func setBool(modified bool, existing bool, required bool) {`
`524`	`532`	`if required != *existing {`
`525`	`533`	`*existing = required`