Skip to content

Import image via COS #68

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
clnperez merged 1 commit into from
Nov 11, 2021
Merged

Import image via COS #68

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
7 changes: 1 addition & 6 deletions data/data/powervs/bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ data "ibm_pi_network" "network" {
pi_cloud_instance_id = var.cloud_instance_id
}

data "ibm_pi_image" "bootstrap_image" {
pi_image_name = var.image_name
pi_cloud_instance_id = var.cloud_instance_id
}

data "ignition_config" "bootstrap" {
merge {
source = ibms3presign.bootstrap_ignition.presigned_url
Expand Down Expand Up @@ -69,7 +64,7 @@ resource "ibm_pi_instance" "bootstrap" {
pi_processors = var.processors
pi_instance_name = "${var.cluster_id}-bootstrap"
pi_proc_type = var.proc_type
pi_image_id = data.ibm_pi_image.bootstrap_image.id
pi_image_id = var.image_id
pi_sys_type = var.sys_type
pi_cloud_instance_id = var.cloud_instance_id
pi_network_ids = [data.ibm_pi_network.network.id]
Expand Down
2 changes: 1 addition & 1 deletion data/data/powervs/bootstrap/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ variable "ignition" {}

variable "cloud_instance_id" {}
variable "resource_group" {}
variable "image_name" {}
variable "image_id" {}
variable "network_name" {}
variable "proc_type" {}
variable "sys_type" {}
Expand Down
17 changes: 11 additions & 6 deletions data/data/powervs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module "bootstrap" {
sys_type = var.powervs_sys_type
proc_type = var.powervs_proc_type
key_id = ibm_pi_key.cluster_key.key_id
image_name = var.powervs_image_name
image_id = ibm_pi_image.boot_image.image_id
network_name = var.powervs_network_name
}

Expand All @@ -57,7 +57,7 @@ module "master" {
sys_type = var.powervs_sys_type
proc_type = var.powervs_proc_type
key_id = ibm_pi_key.cluster_key.key_id
image_name = var.powervs_image_name
image_id = ibm_pi_image.boot_image.image_id
network_name = var.powervs_network_name
}

Expand All @@ -66,10 +66,15 @@ data "ibm_is_subnet" "vpc_subnet" {
name = var.powervs_vpc_subnet_name
}

data "ibm_pi_image" "boot_image" {
provider = ibm.powervs
pi_image_name = var.powervs_image_name
pi_cloud_instance_id = var.powervs_cloud_instance_id
resource "ibm_pi_image" "boot_image" {
provider = ibm.powervs
pi_image_name = "${var.cluster_id}-boot-image"
pi_cloud_instance_id = var.powervs_cloud_instance_id
pi_image_bucket_name = "rhcos-powervs-images-${var.powervs_vpc_region}"
pi_image_bucket_access = "public"
pi_image_bucket_region = var.powervs_vpc_region
pi_image_bucket_file_name = var.powervs_image_bucket_file_name
pi_image_storage_type = var.powervs_image_storage_type
}

data "ibm_pi_network" "pvs_net" {
Expand Down
7 changes: 1 addition & 6 deletions data/data/powervs/master/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@ data "ibm_pi_network" "network" {
pi_cloud_instance_id = var.cloud_instance_id
}

data "ibm_pi_image" "master_image" {
pi_image_name = var.image_name
pi_cloud_instance_id = var.cloud_instance_id
}

# Create the master instances
resource "ibm_pi_instance" "master" {
count = var.instance_count
pi_memory = var.memory
pi_processors = var.processors
pi_instance_name = "${var.cluster_id}-master-${count.index}"
pi_proc_type = var.proc_type
pi_image_id = data.ibm_pi_image.master_image.id
pi_image_id = var.image_id
pi_sys_type = var.sys_type
pi_cloud_instance_id = var.cloud_instance_id
pi_network_ids = [data.ibm_pi_network.network.id]
Expand Down
2 changes: 1 addition & 1 deletion data/data/powervs/master/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variable "key_id" {}

variable "cloud_instance_id" {}
variable "resource_group" {}
variable "image_name" {}
variable "image_id" {}
variable "network_name" {}
variable "proc_type" {}
variable "sys_type" {}
Expand Down
17 changes: 12 additions & 5 deletions data/data/powervs/variables-powervs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ variable "powervs_cos_storage_class" {
################################################################
# Configure instances
################################################################
variable "powervs_image_name" {
type = string
description = "Name of the image used by all nodes in the cluster."
}

variable "powervs_bootstrap_memory" {
type = string
description = "Amount of memory, in GiB, used by the bootstrap node."
Expand Down Expand Up @@ -116,6 +111,18 @@ variable "powervs_ssh_key" {
default = ""
}

variable "powervs_image_bucket_file_name" {
type = string
description = "File name of the image in the COS bucket."
Copy link
Copy Markdown

@clnperez clnperez Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

until we have the rhcos bits from cory, what about setting the default to the current ova, and it'll then be easily change if we need to update it before that PR lands?

Copy link
Copy Markdown
Author

@mjturek mjturek Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds good to me, changing now

default = "rhcos-410-84-202111101637-0-ppc64le-powervs.ova.gz"
}

variable "powervs_image_storage_type" {
type = string
description = "Storage type used when storing image in Power VS."
default = "tier3"
}

################################################################
# Configure Network Topology
################################################################
Expand Down
16 changes: 10 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ require (
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/Azure/go-ntlmssp v0.0.0-20191115210519-2b2be6cc8ed4 // indirect
github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05
github.com/IBM-Cloud/bluemix-go v0.0.0-20210706092416-dc4055f8e0ea
github.com/IBM-Cloud/power-go-client v1.0.72
github.com/IBM-Cloud/terraform-provider-ibm v1.26.2
github.com/IBM/go-sdk-core/v5 v5.4.3
github.com/IBM/networking-go-sdk v0.14.0
github.com/IBM/go-sdk-core/v5 v5.5.1
github.com/IBM/networking-go-sdk v0.19.0
github.com/IBM/platform-services-go-sdk v0.18.16
github.com/IBM/vpc-go-sdk v1.0.1
github.com/Netflix/go-expect v0.0.0-20190729225929-0e00d9168667 // indirect
Expand Down Expand Up @@ -102,7 +102,7 @@ require (
github.com/vmware/govmomi v0.24.0
github.com/wxnacy/wgo v1.0.4
github.com/zclconf/go-cty v1.6.1
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
golang.org/x/lint v0.0.0-20200302205851-738671d3881b
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
Expand All @@ -126,7 +126,7 @@ require (

replace (
cloud.google.com/go => cloud.google.com/go v0.57.0
github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2
github.com/IBM-Cloud/terraform-provider-ibm => github.com/yussufsh/terraform-provider-ibm v1.89.0
github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb // Pinned by MCO
github.com/hashicorp/terraform => github.com/openshift/terraform v0.12.20-openshift-4 // Pin to fork with deduplicated rpc types v0.12.20-openshift-4
github.com/hashicorp/terraform-plugin-sdk => github.com/openshift/hashicorp-terraform-plugin-sdk v1.14.0-openshift // Pin to fork with public rpc types
Expand All @@ -152,7 +152,7 @@ replace (
// Prevent the following modules from upgrading version as result of terraform-provider-kubernetes module
// The following modules need to be locked to compile correctly with terraform-provider-azure, terraform-provider-google, and terraform-provider-ibm
replace (
github.com/IBM/vpc-go-sdk => github.com/IBM/vpc-go-sdk v0.7.0
github.com/IBM/vpc-go-sdk => github.com/IBM/vpc-go-sdk v0.8.0
github.com/apparentlymart/go-cidr => github.com/apparentlymart/go-cidr v1.0.1
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.32.3
github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2
Expand All @@ -166,3 +166,7 @@ replace (
)

replace github.com/openshift/machine-api-operator => github.com/openshift-powervs/machine-api-operator v0.2.1-0.20210809115935-a9fd8f5d2767

replace github.com/IBM-Cloud/power-go-client => github.com/yussufsh/power-go-client v1.99.4

replace github.com/softlayer/softlayer-go => github.com/IBM-Cloud/softlayer-go v1.0.3-tf
Loading