Skip to content

Commit d9baac0

Browse files
committed
METAL-1668: simplify BMC CA assets
A separate asset is not needed to just generate a file, use template instead. Follow-up to PR #10072. Signed-off-by: Dmitry Tantsur <dtantsur@protonmail.com>
1 parent d228bea commit d9baac0

File tree

4 files changed

+9
-75
lines changed

4 files changed

+9
-75
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{ .PlatformData.BareMetal.BMCVerifyCA }}

pkg/asset/ignition/bootstrap/common.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ func (a *Common) Dependencies() []asset.Asset {
172172
&tls.RootCA{},
173173
&tls.ServiceAccountKeyPair{},
174174
&tls.IronicTLSCert{},
175-
&tls.BMCVerifyCA{},
176175
&releaseimage.Image{},
177176
new(rhcos.Image),
178177
}
@@ -675,7 +674,6 @@ func (a *Common) addParentFiles(dependencies asset.Parents) {
675674
&tls.ServiceAccountKeyPair{},
676675
&tls.JournalCertKey{},
677676
&tls.IronicTLSCert{},
678-
&tls.BMCVerifyCA{},
679677
} {
680678
dependencies.Get(asset)
681679

pkg/asset/manifests/bmcverifycaconfigmap.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010
"sigs.k8s.io/yaml"
1111

1212
"github.com/openshift/installer/pkg/asset"
13-
"github.com/openshift/installer/pkg/asset/tls"
13+
"github.com/openshift/installer/pkg/asset/installconfig"
14+
"github.com/openshift/installer/pkg/types/baremetal"
1415
)
1516

1617
var (
@@ -40,18 +41,17 @@ func (*BMCVerifyCAConfigMap) Name() string {
4041
// the asset.
4142
func (*BMCVerifyCAConfigMap) Dependencies() []asset.Asset {
4243
return []asset.Asset{
43-
&tls.BMCVerifyCA{},
44+
&installconfig.InstallConfig{},
4445
}
4546
}
4647

4748
// Generate generates the BMC Verify CA ConfigMap.
4849
func (bvc *BMCVerifyCAConfigMap) Generate(_ context.Context, dependencies asset.Parents) error {
49-
bmcVerifyCA := &tls.BMCVerifyCA{}
50-
dependencies.Get(bmcVerifyCA)
50+
installConfig := &installconfig.InstallConfig{}
51+
dependencies.Get(installConfig)
5152

52-
// Only generate the ConfigMap if BMCVerifyCA has content
53-
files := bmcVerifyCA.Files()
54-
if len(files) == 0 {
53+
// Only generate the file for baremetal platform with BMCVerifyCA configured
54+
if installConfig.Config.Platform.Name() != baremetal.Name || installConfig.Config.Platform.BareMetal == nil || installConfig.Config.Platform.BareMetal.BMCVerifyCA == "" {
5555
return nil
5656
}
5757

@@ -65,7 +65,7 @@ func (bvc *BMCVerifyCAConfigMap) Generate(_ context.Context, dependencies asset.
6565
Name: bmcVerifyCAConfigMapName,
6666
},
6767
Data: map[string]string{
68-
bmcVerifyCAConfigMapDataKey: string(files[0].Data),
68+
bmcVerifyCAConfigMapDataKey: installConfig.Config.Platform.BareMetal.BMCVerifyCA,
6969
},
7070
}
7171

pkg/asset/tls/bmcverifyca.go

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)