Skip to content

Use bucket name from coreos stream rather than inferring it #137

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

Open
mjturek wants to merge 1 commit into
base: add-ipi
Choose a base branch
from
Open

Use bucket name from coreos stream rather than inferring it #137

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
2 changes: 1 addition & 1 deletion data/data/powervs/cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ resource "ibm_pi_image" "boot_image" {
provider = ibm.powervs
pi_image_name = "rhcos-${var.cluster_id}"
pi_cloud_instance_id = var.powervs_cloud_instance_id
pi_image_bucket_name = "rhcos-powervs-images-${var.powervs_vpc_region}"
pi_image_bucket_name = var.powervs_image_bucket_name
pi_image_bucket_access = "public"
pi_image_bucket_region = var.powervs_vpc_region
pi_image_bucket_file_name = var.powervs_image_bucket_file_name
Expand Down
5 changes: 5 additions & 0 deletions data/data/powervs/variables-powervs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ variable "powervs_ssh_key" {
default = ""
}

variable "powervs_image_bucket_name" {
type = string
description = "Name of the COS bucket holding the image."
}

variable "powervs_image_bucket_file_name" {
type = string
description = "File name of the image in the COS bucket."
Expand Down
4 changes: 3 additions & 1 deletion pkg/asset/cluster/tfvars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*powervsprovider.PowerVSMachineProviderConfig)
}

osImage := strings.SplitN(string(*rhcosImage), "/", 2)
data, err = powervstfvars.TFVars(
powervstfvars.TFVarsSources{
MasterConfigs: masterConfigs,
Expand All @@ -700,7 +701,8 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
APIKey: os.Getenv("IC_API_KEY"),
SSHKey: installConfig.Config.SSHKey,
PowerVSResourceGroup: installConfig.Config.PowerVS.PowerVSResourceGroup,
ImageBucketFileName: string(*rhcosImage),
ImageBucketName: osImage[0],
ImageBucketFileName: osImage[1],
NetworkName: installConfig.Config.PowerVS.PVSNetworkName,
CISInstanceCRN: crn,
VPCSubnetName: installConfig.Config.PowerVS.Subnets[0],
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/rhcos/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func osImage(config *types.InstallConfig) (string, error) {
vpcRegion := powervs.Regions[config.Platform.PowerVS.Region].VPCRegion
img := streamArch.Images.PowerVS.Regions[vpcRegion]
logrus.Debug("Power VS using image ", img.Object)
return img.Object, nil
return fmt.Sprintf("%s/%s", img.Bucket, img.Object), nil
}

return "", fmt.Errorf("%s: No Power VS build found", st.FormatPrefix(archName))
Expand Down
3 changes: 3 additions & 0 deletions pkg/tfvars/powervs/powervs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type config struct {
VPCZone string `json:"powervs_vpc_zone"`
PowerVSResourceGroup string `json:"powervs_resource_group"`
CISInstanceCRN string `json:"powervs_cis_crn"`
ImageBucketName string `json:"powervs_image_bucket_name"`
ImageBucketFileName string `json:"powervs_image_bucket_file_name"`
NetworkName string `json:"powervs_network_name"`
VPCName string `json:"powervs_vpc_name"`
Expand All @@ -40,6 +41,7 @@ type TFVarsSources struct {
SSHKey string
Region string
Zone string
ImageBucketName string
ImageBucketFileName string
NetworkName string
PowerVSResourceGroup string
Expand Down Expand Up @@ -71,6 +73,7 @@ func TFVars(sources TFVarsSources) ([]byte, error) {
VPCZone: vpcZone,
PowerVSResourceGroup: sources.PowerVSResourceGroup,
CISInstanceCRN: sources.CISInstanceCRN,
ImageBucketName: sources.ImageBucketName,
ImageBucketFileName: sources.ImageBucketFileName,
NetworkName: *masterConfig.Network.Name,
VPCName: sources.VPCName,
Expand Down