Skip to content

Commit

Permalink
lib/resourcemerge: gosh, set AdditionalTrustedBundle
Browse files Browse the repository at this point in the history
Signed-off-by: Antonio Murdaca <runcom@linux.com>
  • Loading branch information
runcom authored and openshift-cherrypick-robot committed Jun 18, 2020
1 parent b6c95fe commit 94b7f49
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/resourcemerge/machineconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 94b7f49

Please sign in to comment.