Skip to content

Bug 1999734: fix(ibmcloud): Add CIS CRN to infrastructure manifest #5182

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
Oct 7, 2021
Merged

Bug 1999734: fix(ibmcloud): Add CIS CRN to infrastructure manifest #5182

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
6 changes: 6 additions & 0 deletions pkg/asset/manifests/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package manifests

import (
"context"
"path/filepath"
"sort"

Expand Down Expand Up @@ -171,9 +172,14 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
})
case ibmcloud.Name:
config.Spec.PlatformSpec.Type = configv1.IBMCloudPlatformType
cisInstanceCRN, err := installConfig.IBMCloud.CISInstanceCRN(context.TODO())
if err != nil {
return errors.Wrap(err, "cannot retrieve IBM Cloud Internet Services instance CRN")
}
config.Status.PlatformStatus.IBMCloud = &configv1.IBMCloudPlatformStatus{
Location: installConfig.Config.Platform.IBMCloud.Region,
ResourceGroupName: installConfig.Config.Platform.IBMCloud.ClusterResourceGroupName(clusterID.InfraID),
CISInstanceCRN: cisInstanceCRN,
}
case libvirt.Name:
config.Spec.PlatformSpec.Type = configv1.LibvirtPlatformType
Expand Down