Skip to content

Add IBM Power VS: cluster assets #5651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 21, 2022
Merged

Add IBM Power VS: cluster assets #5651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pkg/asset/cluster/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/openshift/installer/pkg/asset/cluster/libvirt"
"github.com/openshift/installer/pkg/asset/cluster/openstack"
"github.com/openshift/installer/pkg/asset/cluster/ovirt"
"github.com/openshift/installer/pkg/asset/cluster/powervs"
"github.com/openshift/installer/pkg/asset/cluster/vsphere"
"github.com/openshift/installer/pkg/asset/ignition/bootstrap"
"github.com/openshift/installer/pkg/asset/installconfig"
Expand All @@ -31,6 +32,7 @@ import (
nonetypes "github.com/openshift/installer/pkg/types/none"
openstacktypes "github.com/openshift/installer/pkg/types/openstack"
ovirttypes "github.com/openshift/installer/pkg/types/ovirt"
powervstypes "github.com/openshift/installer/pkg/types/powervs"
vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
)

Expand Down Expand Up @@ -93,6 +95,8 @@ func (m *Metadata) Generate(parents asset.Parents) (err error) {
metadata.ClusterPlatformMetadata.VSphere = vsphere.Metadata(installConfig.Config)
case alibabacloudtypes.Name:
metadata.ClusterPlatformMetadata.AlibabaCloud = alibabacloud.Metadata(installConfig.Config)
case powervstypes.Name:
metadata.ClusterPlatformMetadata.PowerVS = powervs.Metadata(installConfig.Config, installConfig.PowerVS)
case nonetypes.Name:
default:
return errors.Errorf("no known platform")
Expand Down
21 changes: 21 additions & 0 deletions pkg/asset/cluster/powervs/powervs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Package powervs extracts Power VS metadata from install configurations.
package powervs

import (
"context"

icpowervs "github.com/openshift/installer/pkg/asset/installconfig/powervs"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/powervs"
)

// Metadata converts an install configuration to PowerVS metadata.
func Metadata(config *types.InstallConfig, meta *icpowervs.Metadata) *powervs.Metadata {
cisCRN, _ := meta.CISInstanceCRN(context.TODO())

return &powervs.Metadata{
CISInstanceCRN: cisCRN,
Region: config.Platform.PowerVS.Region,
Zone: config.Platform.PowerVS.Zone,
}
}