Merge pull request openshift#7795 from hamzy/powervs-MULTIARCH-4030

PowerVS: MULTIARCH-4030: Reintroduce serviceInstanceGUID install option

Author: openshift-merge-bot[bot]

data/data/install.openshift.io_installconfigs.yaml

@@ -4378,6 +4378,12 @@ spec:
                     description: Region specifies the IBM Cloud colo region where
                       the cluster will be created.
                     type: string
+                  serviceInstanceGUID:
+                    description: ServiceInstanceGUID is the GUID of the Power IAAS
+                      instance created from the IBM Cloud Catalog before the cluster
+                      is completed.  Leave unset to allow the installer to create
+                      a service instance during cluster creation.
+                    type: string
                   userID:
                     description: UserID is the login for the user's IBM Cloud account.
                     type: string

data/data/powervs/bootstrap/iaas/iaas.tf

@@ -3,5 +3,5 @@ data "ibm_resource_group" "group" {
 }
 
 data "ibm_resource_instance" "powervs_service_instance" {
-  name = "${var.cluster_id}-power-iaas"
+  name = var.service_instance_name == "" ? "${var.cluster_id}-power-iaas" : var.service_instance_name
 }

data/data/powervs/bootstrap/iaas/variables.tf

@@ -7,3 +7,8 @@ variable "resource_group" {
   type        = string
   description = "The name of the Power VS resource group to which the user belongs."
 }
+
+variable "service_instance_name" {
+  type        = string
+  description = "Optionally, the service instance name of an existing object before cluster creation"
+}

data/data/powervs/bootstrap/main.tf

@@ -61,6 +61,7 @@ module "iaas" {
   # define and pass variables to:
   # data/data/powervs/bootstrap/iaas/variables.tf
   #
-  cluster_id     = var.cluster_id
-  resource_group = var.powervs_resource_group
+  cluster_id            = var.cluster_id
+  resource_group        = var.powervs_resource_group
+  service_instance_name = var.powervs_service_instance_name
 }

data/data/powervs/cluster/iaas/iaas.tf

@@ -2,7 +2,15 @@ data "ibm_resource_group" "group" {
   name = var.resource_group
 }
 
-resource "ibm_resource_instance" "powervs_service_instance" {
+data "ibm_resource_instance" "existing_service_instance" {
+  count             = var.service_instance_name != "" ? 1 : 0
+  name              = var.service_instance_name
+  service           = "power-iaas"
+  resource_group_id = data.ibm_resource_group.group.id
+}
+
+resource "ibm_resource_instance" "created_service_instance" {
+  count             = var.service_instance_name == "" ? 1 : 0
   name              = "${var.cluster_id}-power-iaas"
   service           = "power-iaas"
   plan              = "power-virtual-server-group"

data/data/powervs/cluster/iaas/outputs.tf

@@ -1,7 +1,11 @@
+output "si_name" {
+  value = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].name) : one(data.ibm_resource_instance.existing_service_instance[*].name)
+}
+
 output "si_guid" {
-  value = ibm_resource_instance.powervs_service_instance.guid
+  value = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].guid) : one(data.ibm_resource_instance.existing_service_instance[*].guid)
 }
 
 output "si_crn" {
-  value = ibm_resource_instance.powervs_service_instance.crn
+  value = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].crn) : one(data.ibm_resource_instance.existing_service_instance[*].crn)
 }

data/data/powervs/cluster/iaas/variables.tf

@@ -12,3 +12,8 @@ variable "powervs_zone" {
   type        = string
   description = "The Power VS zone in which to create resources."
 }
+
+variable "service_instance_name" {
+  type        = string
+  description = "Optionally, the service instance name of an existing object before cluster creation"
+}

data/data/powervs/cluster/main.tf

@@ -56,12 +56,12 @@ module "master" {
   providers = {
     ibm = ibm.powervs
   }
-  source            = "./master"
-  cloud_instance_id = module.iaas.si_guid
-  cluster_id        = var.cluster_id
-  resource_group    = var.powervs_resource_group
-  instance_count    = var.master_count
+  source = "./master"
 
+  cloud_instance_id   = module.iaas.si_guid
+  cluster_id          = var.cluster_id
+  resource_group      = var.powervs_resource_group
+  instance_count      = var.master_count
   api_key             = var.powervs_api_key
   powervs_region      = var.powervs_region
   powervs_zone        = var.powervs_zone
@@ -166,7 +166,8 @@ module "iaas" {
   # define and pass variables to:
   # data/data/powervs/cluster/iaas/variables.tf
   #
-  cluster_id     = var.cluster_id
-  resource_group = var.powervs_resource_group
-  powervs_zone   = var.powervs_zone
+  cluster_id            = var.cluster_id
+  resource_group        = var.powervs_resource_group
+  powervs_zone          = var.powervs_zone
+  service_instance_name = var.powervs_service_instance_name
 }

data/data/powervs/variables-powervs.tf

@@ -40,6 +40,11 @@ variable "powervs_publish_strategy" {
   default     = "External"
 }
 
+variable "powervs_service_instance_name" {
+  type        = string
+  description = "Optionally, the service instance name of an existing object before cluster creation"
+}
+
 ################################################################
 # Configure storage
 ################################################################

pkg/asset/cluster/powervs/powervs.go

@@ -22,5 +22,6 @@ func Metadata(config *types.InstallConfig, meta *icpowervs.Metadata) *powervs.Me
 		Region:               config.Platform.PowerVS.Region,
 		VPCRegion:            config.Platform.PowerVS.VPCRegion,
 		Zone:                 config.Platform.PowerVS.Zone,
+		ServiceInstanceGUID:  config.Platform.PowerVS.ServiceInstanceGUID,
 	}
 }