Merge pull request #10243 from dtantsur/bmc-ca

METAL-1668: simplify BMC CA assets

Author: openshift-merge-bot[bot]

data/data/bootstrap/baremetal/files/opt/openshift/bmc-ca/verify_ca.crt.template

@@ -0,0 +1 @@
+{{ .PlatformData.BareMetal.BMCVerifyCA }}

pkg/asset/ignition/bootstrap/common.go

@@ -173,7 +173,6 @@ func (a *Common) Dependencies() []asset.Asset {
 		&tls.RootCA{},
 		&tls.ServiceAccountKeyPair{},
 		&tls.IronicTLSCert{},
-		&tls.BMCVerifyCA{},
 		&releaseimage.Image{},
 		new(rhcos.Image),
 	}
@@ -676,7 +675,6 @@ func (a *Common) addParentFiles(dependencies asset.Parents) {
 		&tls.ServiceAccountKeyPair{},
 		&tls.JournalCertKey{},
 		&tls.IronicTLSCert{},
-		&tls.BMCVerifyCA{},
 	} {
 		dependencies.Get(asset)
 

pkg/asset/manifests/bmcverifycaconfigmap.go

@@ -10,7 +10,8 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/openshift/installer/pkg/asset/tls"
+	"github.com/openshift/installer/pkg/asset/installconfig"
+	"github.com/openshift/installer/pkg/types/baremetal"
 )
 
 var (
@@ -40,18 +41,17 @@ func (*BMCVerifyCAConfigMap) Name() string {
 // the asset.
 func (*BMCVerifyCAConfigMap) Dependencies() []asset.Asset {
 	return []asset.Asset{
-		&tls.BMCVerifyCA{},
+		&installconfig.InstallConfig{},
 	}
 }
 
 // Generate generates the BMC Verify CA ConfigMap.
 func (bvc *BMCVerifyCAConfigMap) Generate(_ context.Context, dependencies asset.Parents) error {
-	bmcVerifyCA := &tls.BMCVerifyCA{}
-	dependencies.Get(bmcVerifyCA)
+	installConfig := &installconfig.InstallConfig{}
+	dependencies.Get(installConfig)
 
-	// Only generate the ConfigMap if BMCVerifyCA has content
-	files := bmcVerifyCA.Files()
-	if len(files) == 0 {
+	// Only generate the file for baremetal platform with BMCVerifyCA configured
+	if installConfig.Config.Platform.Name() != baremetal.Name || installConfig.Config.Platform.BareMetal == nil || installConfig.Config.Platform.BareMetal.BMCVerifyCA == "" {
 		return nil
 	}
 
@@ -65,7 +65,7 @@ func (bvc *BMCVerifyCAConfigMap) Generate(_ context.Context, dependencies asset.
 			Name:      bmcVerifyCAConfigMapName,
 		},
 		Data: map[string]string{
-			bmcVerifyCAConfigMapDataKey: string(files[0].Data),
+			bmcVerifyCAConfigMapDataKey: installConfig.Config.Platform.BareMetal.BMCVerifyCA,
 		},
 	}