Merge pull request openshift#1843 from openshift-cherrypick-robot/che…

…rry-pick-1714-to-release-4.4 [release-4.4] Bug 1848369: lib/resourcemerge: set AdditionalTrustBundle
mtrmac · Jun 19, 2020 · 0dace7a · 0dace7a
2 parents cba4bab + 94b7f49
commit 0dace7a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/resourcemerge/machineconfig.go b/lib/resourcemerge/machineconfig.go
@@ -68,6 +68,7 @@ func ensureControllerConfigSpec(modified *bool, existing *mcfgv1.ControllerConfi
 	setStringIfSet(modified, &existing.EtcdDiscoveryDomain, required.EtcdDiscoveryDomain)
 	setStringIfSet(modified, &existing.OSImageURL, required.OSImageURL)
 
+	setBytesIfSet(modified, &existing.AdditionalTrustBundle, required.AdditionalTrustBundle)
 	setBytesIfSet(modified, &existing.EtcdCAData, required.EtcdCAData)
 	setBytesIfSet(modified, &existing.EtcdMetricCAData, required.EtcdMetricCAData)
 	setBytesIfSet(modified, &existing.RootCAData, required.RootCAData)