Merge pull request #1175 from openshift-cherrypick-robot/cherry-pick-…

…1174-to-release-4.2 Bug 1759611: [release-4.2] lib/resourcemerge: account for proxy changes
openshift · Nov 21, 2019 · 43c8d84 · 43c8d84
2 parents 46f291c + 824a895
commit 43c8d84
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/resourcemerge/machineconfig.go b/lib/resourcemerge/machineconfig.go
@@ -71,6 +71,11 @@ func ensureControllerConfigSpec(modified *bool, existing *mcfgv1.ControllerConfi
 	setBytesIfSet(modified, &existing.RootCAData, required.RootCAData)
 	setBytesIfSet(modified, &existing.KubeAPIServerServingCAData, required.KubeAPIServerServingCAData)
 
+	if !equality.Semantic.DeepEqual(existing.Proxy, required.Proxy) {
+		*modified = true
+		existing.Proxy = required.Proxy
+	}
+
 	if required.PullSecret != nil && !equality.Semantic.DeepEqual(existing.PullSecret, required.PullSecret) {
 		existing.PullSecret = required.PullSecret
 		*modified = true