lib/resourcemerge/core: set TerminationGracePeriodSeconds

vrutkovs · vrutkovs · commit 47d87e1083cb · 2020-08-12T10:23:10.000+02:00
Ensure TerminationGracePeriodSeconds from PodSpec is being reconciled
diff --git a/lib/resourcemerge/core.go b/lib/resourcemerge/core.go
@@ -61,6 +61,7 @@ func ensurePodSpec(modified *bool, existing *corev1.PodSpec, required corev1.Pod
 	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) {

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ func ensurePodSpec(modified bool, existing corev1.PodSpec, required corev1.Pod`
`61`	`61`	`setInt32Ptr(modified, &existing.Priority, required.Priority)`
`62`	`62`	`setBoolPtr(modified, &existing.ShareProcessNamespace, required.ShareProcessNamespace)`
`63`	`63`	`ensureDNSPolicy(modified, &existing.DNSPolicy, required.DNSPolicy)`
	`64`	`+ setInt64Ptr(modified, &existing.TerminationGracePeriodSeconds, required.TerminationGracePeriodSeconds)`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`func ensureContainers(modified bool, existing []corev1.Container, required []corev1.Container) {`