Fix additionalTrustBundle with local ignition provider

In openshift#972 I relied on the fact that MCSIgnitionProvider mounts the MCO ConfigMap under /assets/manifests - this means that the user-ca-bundle-config.yaml file path matches the default location from the MCO bootstrap code, thus no explicit --additional-trust-bundle-config-file argument was required. In openshift#1214 we introduced a new LocalIgnitionProvider, which unpacks the MCO config to a different path e.g /payloads/get-payload123/config hence we need to explicitly pass --additional-trust-bundle-config-file or the additionalTrustBundle data is ignored.
gnufied · Jul 28, 2022 · 302aed5 · 302aed5
1 parent 917c954
commit 302aed5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ignition-server/controllers/local_ignitionprovider.go b/ignition-server/controllers/local_ignitionprovider.go
@@ -250,6 +250,9 @@ func (p *LocalIgnitionProvider) GetPayload(ctx context.Context, releaseImage str
 		if image, exists := images["mdns-publisher"]; exists {
 			args = append(args, fmt.Sprintf("--mdns-publisher-image=%s", image))
 		}
+		if mcsConfig.Data["user-ca-bundle-config.yaml"] != "" {
+			args = append(args, fmt.Sprintf("--additional-trust-bundle-config-file=%s/user-ca-bundle-config.yaml", configDir))
+		}
 		if p.CloudProvider == hyperv1.AzurePlatform {
 			args = append(args, fmt.Sprintf("--cloud-config-file=%s/cloud.conf.configmap.yaml", mcoBaseDir))
 		}