Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ .PlatformData.BareMetal.BMCVerifyCA }}
2 changes: 0 additions & 2 deletions pkg/asset/ignition/bootstrap/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ func (a *Common) Dependencies() []asset.Asset {
&tls.RootCA{},
&tls.ServiceAccountKeyPair{},
&tls.IronicTLSCert{},
&tls.BMCVerifyCA{},
&releaseimage.Image{},
new(rhcos.Image),
}
Expand Down Expand Up @@ -675,7 +674,6 @@ func (a *Common) addParentFiles(dependencies asset.Parents) {
&tls.ServiceAccountKeyPair{},
&tls.JournalCertKey{},
&tls.IronicTLSCert{},
&tls.BMCVerifyCA{},
} {
dependencies.Get(asset)

Expand Down
16 changes: 8 additions & 8 deletions pkg/asset/manifests/bmcverifycaconfigmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
}

Expand All @@ -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,
},
}

Expand Down
65 changes: 0 additions & 65 deletions pkg/asset/tls/bmcverifyca.go

This file was deleted.