From 6b535522e2beb2409f3c153329331cc4c455de4a Mon Sep 17 00:00:00 2001
From: Christopher J Schaefer <cjschaef@us.ibm.com>
Date: Tue, 20 Sep 2022 16:30:05 -0500
Subject: [PATCH 1/2] CORS-2386: IBMCloud: Add networkResourceGroupName

Added a new installconfig option, networkResourceGroupName, to
specify the existing ResourceGroup where existing BYON resources
exist. This allows the use to create new cluster resources in new
ResourceGroups, or specify the existing ResourceGroup (even the
same as network) to create those resources.

Related: https://issues.redhat.com/browse/CORS-2386
---
 data/data/ibmcloud/network/main.tf            |  23 ++--
 data/data/ibmcloud/network/vpc/variables.tf   |   4 +
 data/data/ibmcloud/network/vpc/vpc.tf         |   8 +-
 data/data/ibmcloud/variables-ibmcloud.tf      |  12 +-
 .../install.openshift.io_installconfigs.yaml  |  11 +-
 pkg/asset/cluster/tfvars.go                   |  27 ++---
 .../installconfig/ibmcloud/validation.go      |  33 +++---
 .../installconfig/ibmcloud/validation_test.go |  66 +++++------
 pkg/asset/machines/ibmcloud/machines.go       |  25 +++--
 pkg/asset/machines/master.go                  |   4 +-
 pkg/asset/machines/worker.go                  |   4 +-
 pkg/tfvars/ibmcloud/ibmcloud.go               | 103 +++++++++---------
 pkg/types/ibmcloud/platform.go                |  10 +-
 13 files changed, 189 insertions(+), 141 deletions(-)

diff --git a/data/data/ibmcloud/network/main.tf b/data/data/ibmcloud/network/main.tf
index 881259bf920..0e7c5a3fed1 100644
--- a/data/data/ibmcloud/network/main.tf
+++ b/data/data/ibmcloud/network/main.tf
@@ -1,11 +1,17 @@
 locals {
-  resource_group_id = var.ibmcloud_resource_group_name == "" ? ibm_resource_group.group.0.id : data.ibm_resource_group.group.0.id
+  network_resource_group_id = var.ibmcloud_network_resource_group_name == "" ? local.resource_group_id : data.ibm_resource_group.network_group.0.id
+  resource_group_id         = var.ibmcloud_resource_group_name == "" ? ibm_resource_group.group.0.id : data.ibm_resource_group.group.0.id
 }
 
 ############################################
-# Resource group
+# Resource groups
 ############################################
 
+data "ibm_resource_group" "network_group" {
+  count = var.ibmcloud_network_resource_group_name == "" ? 0 : 1
+  name  = var.ibmcloud_network_resource_group_name
+}
+
 resource "ibm_resource_group" "group" {
   count = var.ibmcloud_resource_group_name == "" ? 1 : 0
   name  = var.cluster_id
@@ -100,12 +106,13 @@ module "dhost" {
 module "vpc" {
   source = "./vpc"
 
-  cluster_id        = var.cluster_id
-  public_endpoints  = local.public_endpoints
-  resource_group_id = local.resource_group_id
-  tags              = local.tags
-  zones_master      = distinct(var.ibmcloud_master_availability_zones)
-  zones_worker      = distinct(var.ibmcloud_worker_availability_zones)
+  cluster_id                = var.cluster_id
+  network_resource_group_id = local.network_resource_group_id
+  public_endpoints          = local.public_endpoints
+  resource_group_id         = local.resource_group_id
+  tags                      = local.tags
+  zones_master              = distinct(var.ibmcloud_master_availability_zones)
+  zones_worker              = distinct(var.ibmcloud_worker_availability_zones)
 
   preexisting_vpc       = var.ibmcloud_preexisting_vpc
   cluster_vpc           = var.ibmcloud_vpc
diff --git a/data/data/ibmcloud/network/vpc/variables.tf b/data/data/ibmcloud/network/vpc/variables.tf
index 0b598f4accd..ea91bd6fc36 100644
--- a/data/data/ibmcloud/network/vpc/variables.tf
+++ b/data/data/ibmcloud/network/vpc/variables.tf
@@ -6,6 +6,10 @@ variable "cluster_id" {
   type = string
 }
 
+variable "network_resource_group_id" {
+  type = string
+}
+
 variable "public_endpoints" {
   type = bool
 }
diff --git a/data/data/ibmcloud/network/vpc/vpc.tf b/data/data/ibmcloud/network/vpc/vpc.tf
index f5d665b7098..f92c1741b5d 100644
--- a/data/data/ibmcloud/network/vpc/vpc.tf
+++ b/data/data/ibmcloud/network/vpc/vpc.tf
@@ -5,7 +5,7 @@
 resource "ibm_is_vpc" "vpc" {
   count          = var.preexisting_vpc ? 0 : 1
   name           = "${local.prefix}-vpc"
-  resource_group = var.resource_group_id
+  resource_group = var.network_resource_group_id
   tags           = var.tags
 }
 
@@ -17,7 +17,7 @@ resource "ibm_is_public_gateway" "public_gateway" {
   count = var.preexisting_vpc ? 0 : length(local.zones_all)
 
   name           = "${local.prefix}-public-gateway-${local.zones_all[count.index]}"
-  resource_group = var.resource_group_id
+  resource_group = var.network_resource_group_id
   tags           = var.tags
   vpc            = ibm_is_vpc.vpc[0].id
   zone           = local.zones_all[count.index]
@@ -31,7 +31,7 @@ resource "ibm_is_subnet" "control_plane" {
   count = var.preexisting_vpc ? 0 : length(var.zones_master)
 
   name                     = "${local.prefix}-subnet-control-plane-${var.zones_master[count.index]}"
-  resource_group           = var.resource_group_id
+  resource_group           = var.network_resource_group_id
   tags                     = var.tags
   vpc                      = ibm_is_vpc.vpc[0].id
   zone                     = var.zones_master[count.index]
@@ -43,7 +43,7 @@ resource "ibm_is_subnet" "compute" {
   count = var.preexisting_vpc ? 0 : length(var.zones_worker)
 
   name                     = "${local.prefix}-subnet-compute-${var.zones_worker[count.index]}"
-  resource_group           = var.resource_group_id
+  resource_group           = var.network_resource_group_id
   tags                     = var.tags
   vpc                      = ibm_is_vpc.vpc[0].id
   zone                     = var.zones_worker[count.index]
diff --git a/data/data/ibmcloud/variables-ibmcloud.tf b/data/data/ibmcloud/variables-ibmcloud.tf
index e4782297ae2..43d6a1a2064 100644
--- a/data/data/ibmcloud/variables-ibmcloud.tf
+++ b/data/data/ibmcloud/variables-ibmcloud.tf
@@ -117,9 +117,19 @@ variable "ibmcloud_publish_strategy" {
   # }
 }
 
-variable "ibmcloud_resource_group_name" {
+variable "ibmcloud_network_resource_group_name" {
   type = string
   description = <<EOF
+(optional) The name of the resource group for existing cluster network resources. If this is set, the existing network resources
+(VPC, Subnets, etc.) must exist in the resource group to be used for cluster creation. Otherwise, new network resources are
+created in the same resource group as the other cluster resources (see 'ibmcloud_resource_group_name').
+EOF
+  default = ""
+}
+
+variable "ibmcloud_resource_group_name" {
+  type        = string
+  description = <<EOF
 (optional) The name of the resource group for the cluster. If this is set, the cluster is installed to that existing resource group
 otherwise a new resource group will be created using cluster id.
 EOF
diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml
index c6762e28214..2fcb43c0b86 100644
--- a/data/data/install.openshift.io_installconfigs.yaml
+++ b/data/data/install.openshift.io_installconfigs.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: installconfigs.install.openshift.io
 spec:
@@ -2475,6 +2475,11 @@ spec:
                           type: string
                         type: array
                     type: object
+                  networkResourceGroupName:
+                    description: NetworkResourceGroupName is the name of an already
+                      existing resource group where an existing VPC and set of Subnets
+                      exist, to be used during cluster creation.
+                    type: string
                   region:
                     description: Region specifies the IBM Cloud region where the cluster
                       will be created.
@@ -2485,8 +2490,8 @@ spec:
                       a new resource group will be created for the cluster.
                     type: string
                   vpcName:
-                    description: VPCName is the name of an already existing VPC where
-                      the cluster should be installed.
+                    description: VPCName is the name of an already existing VPC to
+                      be used during cluster creation.
                     type: string
                 required:
                 - region
diff --git a/pkg/asset/cluster/tfvars.go b/pkg/asset/cluster/tfvars.go
index ed74b061fd9..df7563f46be 100644
--- a/pkg/asset/cluster/tfvars.go
+++ b/pkg/asset/cluster/tfvars.go
@@ -20,7 +20,6 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	machinev1 "github.com/openshift/api/machine/v1"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	ibmcloudprovider "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1"
 	"github.com/openshift/installer/pkg/asset"
@@ -67,6 +66,7 @@ import (
 	"github.com/openshift/installer/pkg/types/ovirt"
 	"github.com/openshift/installer/pkg/types/powervs"
 	"github.com/openshift/installer/pkg/types/vsphere"
+	ibmcloudprovider "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 )
 
 const (
@@ -603,18 +603,19 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 
 		data, err = ibmcloudtfvars.TFVars(
 			ibmcloudtfvars.TFVarsSources{
-				Auth:                 auth,
-				CISInstanceCRN:       cisCRN,
-				DNSInstanceID:        dnsID,
-				ImageURL:             string(*rhcosImage),
-				MasterConfigs:        masterConfigs,
-				MasterDedicatedHosts: masterDedicatedHosts,
-				PreexistingVPC:       preexistingVPC,
-				PublishStrategy:      installConfig.Config.Publish,
-				ResourceGroupName:    installConfig.Config.Platform.IBMCloud.ResourceGroupName,
-				VPCPermitted:         vpcPermitted,
-				WorkerConfigs:        workerConfigs,
-				WorkerDedicatedHosts: workerDedicatedHosts,
+				Auth:                     auth,
+				CISInstanceCRN:           cisCRN,
+				DNSInstanceID:            dnsID,
+				ImageURL:                 string(*rhcosImage),
+				MasterConfigs:            masterConfigs,
+				MasterDedicatedHosts:     masterDedicatedHosts,
+				NetworkResourceGroupName: installConfig.Config.Platform.IBMCloud.NetworkResourceGroupName,
+				PreexistingVPC:           preexistingVPC,
+				PublishStrategy:          installConfig.Config.Publish,
+				ResourceGroupName:        installConfig.Config.Platform.IBMCloud.ResourceGroupName,
+				VPCPermitted:             vpcPermitted,
+				WorkerConfigs:            workerConfigs,
+				WorkerDedicatedHosts:     workerDedicatedHosts,
 			},
 		)
 		if err != nil {
diff --git a/pkg/asset/installconfig/ibmcloud/validation.go b/pkg/asset/installconfig/ibmcloud/validation.go
index 9e520cab1cc..4336266c333 100644
--- a/pkg/asset/installconfig/ibmcloud/validation.go
+++ b/pkg/asset/installconfig/ibmcloud/validation.go
@@ -39,10 +39,10 @@ func validatePlatform(client API, ic *types.InstallConfig, path *field.Path) fie
 	allErrs := field.ErrorList{}
 
 	if ic.Platform.IBMCloud.ResourceGroupName != "" {
-		allErrs = append(allErrs, validateResourceGroup(client, ic, path)...)
+		allErrs = append(allErrs, validateResourceGroup(client, ic.IBMCloud.ResourceGroupName, "resourceGroupName", path)...)
 	}
 
-	if ic.Platform.IBMCloud.VPCName != "" {
+	if ic.Platform.IBMCloud.NetworkResourceGroupName != "" || ic.Platform.IBMCloud.VPCName != "" {
 		allErrs = append(allErrs, validateExistingVPC(client, ic, path)...)
 	}
 
@@ -196,27 +196,27 @@ func validateMachinePoolBootVolume(client API, bootVolume ibmcloud.BootVolume, p
 	return allErrs
 }
 
-func validateResourceGroup(client API, ic *types.InstallConfig, path *field.Path) field.ErrorList {
+func validateResourceGroup(client API, resourceGroupName string, platformField string, path *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	if ic.IBMCloud.ResourceGroupName == "" {
+	if resourceGroupName == "" {
 		return allErrs
 	}
 
 	resourceGroups, err := client.GetResourceGroups(context.TODO())
 	if err != nil {
-		return append(allErrs, field.InternalError(path.Child("resourceGroupName"), err))
+		return append(allErrs, field.InternalError(path.Child(platformField), err))
 	}
 
 	found := false
 	for _, rg := range resourceGroups {
-		if *rg.ID == ic.IBMCloud.ResourceGroupName || *rg.Name == ic.IBMCloud.ResourceGroupName {
+		if *rg.ID == resourceGroupName || *rg.Name == resourceGroupName {
 			found = true
 		}
 	}
 
 	if !found {
-		return append(allErrs, field.NotFound(path.Child("resourceGroupName"), ic.IBMCloud.ResourceGroupName))
+		return append(allErrs, field.NotFound(path.Child(platformField), resourceGroupName))
 	}
 
 	return allErrs
@@ -226,12 +226,13 @@ func validateExistingVPC(client API, ic *types.InstallConfig, path *field.Path)
 	allErrs := field.ErrorList{}
 
 	if ic.IBMCloud.VPCName == "" {
-		return allErrs
+		return append(allErrs, field.Invalid(path.Child("vpcName"), ic.IBMCloud.VPCName, fmt.Sprintf("vpcName cannot be empty when providing a networkResourceGroupName: %s", ic.IBMCloud.NetworkResourceGroupName)))
 	}
 
-	if ic.IBMCloud.ResourceGroupName == "" {
-		return append(allErrs, field.NotFound(path.Child("resourceGroupName"), ic.IBMCloud.ResourceGroupName))
+	if ic.IBMCloud.NetworkResourceGroupName == "" {
+		return append(allErrs, field.Invalid(path.Child("networkResourceGroupName"), ic.IBMCloud.NetworkResourceGroupName, fmt.Sprintf("networkResourceGroupName cannot be empty when providing a vpcName: %s", ic.IBMCloud.VPCName)))
 	}
+	allErrs = append(allErrs, validateResourceGroup(client, ic.IBMCloud.NetworkResourceGroupName, "networkResourceGroupName", path)...)
 
 	vpcs, err := client.GetVPCs(context.TODO(), ic.IBMCloud.Region)
 	if err != nil {
@@ -241,8 +242,8 @@ func validateExistingVPC(client API, ic *types.InstallConfig, path *field.Path)
 	found := false
 	for _, vpc := range vpcs {
 		if *vpc.Name == ic.IBMCloud.VPCName {
-			if *vpc.ResourceGroup.ID != ic.IBMCloud.ResourceGroupName && *vpc.ResourceGroup.Name != ic.IBMCloud.ResourceGroupName {
-				return append(allErrs, field.Invalid(path.Child("vpcName"), ic.IBMCloud.VPCName, fmt.Sprintf("vpc is not in provided ResourceGroup: %s", ic.IBMCloud.ResourceGroupName)))
+			if *vpc.ResourceGroup.ID != ic.IBMCloud.NetworkResourceGroupName && *vpc.ResourceGroup.Name != ic.IBMCloud.NetworkResourceGroupName {
+				return append(allErrs, field.Invalid(path.Child("vpcName"), ic.IBMCloud.VPCName, fmt.Sprintf("vpc is not in provided Network ResourceGroup: %s", ic.IBMCloud.NetworkResourceGroupName)))
 			}
 			found = true
 			allErrs = append(allErrs, validateExistingSubnets(client, ic, path, *vpc.ID)...)
@@ -276,8 +277,8 @@ func validateExistingSubnets(client API, ic *types.InstallConfig, path *field.Pa
 				if *subnet.VPC.ID != vpcID {
 					allErrs = append(allErrs, field.Invalid(path.Child("controlPlaneSubnets"), controlPlaneSubnet, fmt.Sprintf("controlPlaneSubnets contains subnet: %s, not found in expected vpcID: %s", controlPlaneSubnet, vpcID)))
 				}
-				if *subnet.ResourceGroup.ID != ic.IBMCloud.ResourceGroupName && *subnet.ResourceGroup.Name != ic.IBMCloud.ResourceGroupName {
-					allErrs = append(allErrs, field.Invalid(path.Child("controlPlaneSubnets"), controlPlaneSubnet, fmt.Sprintf("controlPlaneSubnets contains subnet: %s, not found in expected resourceGroupName: %s", controlPlaneSubnet, ic.IBMCloud.ResourceGroupName)))
+				if *subnet.ResourceGroup.ID != ic.IBMCloud.NetworkResourceGroupName && *subnet.ResourceGroup.Name != ic.IBMCloud.NetworkResourceGroupName {
+					allErrs = append(allErrs, field.Invalid(path.Child("controlPlaneSubnets"), controlPlaneSubnet, fmt.Sprintf("controlPlaneSubnets contains subnet: %s, not found in expected networkResourceGroupName: %s", controlPlaneSubnet, ic.IBMCloud.NetworkResourceGroupName)))
 				}
 				controlPlaneSubnetZones[*subnet.Zone.Name]++
 			}
@@ -323,8 +324,8 @@ func validateExistingSubnets(client API, ic *types.InstallConfig, path *field.Pa
 				if *subnet.VPC.ID != vpcID {
 					allErrs = append(allErrs, field.Invalid(path.Child("computeSubnets"), computeSubnet, fmt.Sprintf("computeSubnets contains subnet: %s, not found in expected vpcID: %s", computeSubnet, vpcID)))
 				}
-				if *subnet.ResourceGroup.ID != ic.IBMCloud.ResourceGroupName && *subnet.ResourceGroup.Name != ic.IBMCloud.ResourceGroupName {
-					allErrs = append(allErrs, field.Invalid(path.Child("computeSubnets"), computeSubnet, fmt.Sprintf("computeSubnets contains subnet: %s, not found in expected resourceGroupName: %s", computeSubnet, ic.IBMCloud.ResourceGroupName)))
+				if *subnet.ResourceGroup.ID != ic.IBMCloud.NetworkResourceGroupName && *subnet.ResourceGroup.Name != ic.IBMCloud.NetworkResourceGroupName {
+					allErrs = append(allErrs, field.Invalid(path.Child("computeSubnets"), computeSubnet, fmt.Sprintf("computeSubnets contains subnet: %s, not found in expected networkResourceGroupName: %s", computeSubnet, ic.IBMCloud.NetworkResourceGroupName)))
 				}
 				computeSubnetZones[*subnet.Zone.Name]++
 			}
diff --git a/pkg/asset/installconfig/ibmcloud/validation_test.go b/pkg/asset/installconfig/ibmcloud/validation_test.go
index 6d674ee11ef..5b5b8eaf2c5 100644
--- a/pkg/asset/installconfig/ibmcloud/validation_test.go
+++ b/pkg/asset/installconfig/ibmcloud/validation_test.go
@@ -234,6 +234,10 @@ func validResourceGroupName(ic *types.InstallConfig) {
 	ic.Platform.IBMCloud.ResourceGroupName = "valid-resource-group"
 }
 
+func validNetworkResourceGroupName(ic *types.InstallConfig) {
+	ic.Platform.IBMCloud.NetworkResourceGroupName = "valid-resource-group"
+}
+
 func validVPCName(ic *types.InstallConfig) {
 	ic.Platform.IBMCloud.VPCName = "valid-vpc"
 }
@@ -270,16 +274,16 @@ func TestValidate(t *testing.T) {
 			errorMsg: "",
 		},
 		{
-			name: "VPC with no ResourceGroup supplied",
+			name: "VPC with no network ResourceGroup supplied",
 			edits: editFunctions{
 				validVPCName,
 			},
-			errorMsg: `resourceGroupName: Not found: ""$`,
+			errorMsg: `platform.ibmcloud.networkResourceGroupName: Invalid value: "": networkResourceGroupName cannot be empty when providing a vpcName: valid-vpc`,
 		},
 		{
 			name: "VPC not found",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.VPCName = "missing-vpc"
 				},
@@ -287,19 +291,19 @@ func TestValidate(t *testing.T) {
 			errorMsg: `vpcName: Not found: "missing-vpc"$`,
 		},
 		{
-			name: "VPC not in ResourceGroup",
+			name: "VPC not in network ResourceGroup",
 			edits: editFunctions{
 				func(ic *types.InstallConfig) {
-					ic.Platform.IBMCloud.ResourceGroupName = "wrong-resource-group"
+					ic.Platform.IBMCloud.NetworkResourceGroupName = wrongRG
 				},
 				validVPCName,
 			},
-			errorMsg: `platform.ibmcloud.vpcName: Invalid value: "valid-vpc": vpc is not in provided ResourceGroup: wrong-resource-group`,
+			errorMsg: `platform.ibmcloud.vpcName: Invalid value: "valid-vpc": vpc is not in provided Network ResourceGroup: wrong-resource-group`,
 		},
 		{
 			name: "VPC with no control plane subnets",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 			},
 			errorMsg: `\Qplatform.ibmcloud.controlPlaneSubnets: Invalid value: []string(nil): controlPlaneSubnets cannot be empty when providing a vpcName: valid-vpc\E`,
@@ -307,7 +311,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet not found",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{"missing-cp-subnet"}
@@ -318,7 +322,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet IBM error",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{"ibm-error-cp-subnet"}
@@ -329,7 +333,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet invalid VPC",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.VPCName = "wrong-vpc"
 				},
@@ -343,19 +347,19 @@ func TestValidate(t *testing.T) {
 			name: "control plane subnet invalid ResourceGroup",
 			edits: editFunctions{
 				func(ic *types.InstallConfig) {
-					ic.Platform.IBMCloud.ResourceGroupName = "wrong-resource-group"
+					ic.Platform.IBMCloud.NetworkResourceGroupName = wrongRG
 				},
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{"valid-subnet"}
 				},
 			},
-			errorMsg: `platform.ibmcloud.controlPlaneSubnets: Invalid value: "valid-subnet": controlPlaneSubnets contains subnet: valid-subnet, not found in expected resourceGroupName: wrong-resource-group`,
+			errorMsg: `platform.ibmcloud.controlPlaneSubnets: Invalid value: "valid-subnet": controlPlaneSubnets contains subnet: valid-subnet, not found in expected networkResourceGroupName: wrong-resource-group`,
 		},
 		{
 			name: "control plane subnet no zones",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -366,7 +370,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet no machinepoolplatform",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -380,7 +384,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet invalid zones",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name}
@@ -395,7 +399,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet valid zones some",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet2Name, validSubnet3Name}
@@ -409,7 +413,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "control plane subnet valid zones all",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -423,7 +427,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "VPC with no compute subnets",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 			},
 			errorMsg: `\Qplatform.ibmcloud.computeSubnets: Invalid value: []string(nil): computeSubnets cannot be empty when providing a vpcName: valid-vpc\E`,
@@ -431,7 +435,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "compute subnet not found",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ComputeSubnets = []string{"missing-compute-subnet"}
@@ -442,7 +446,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "compute subnet IBM error",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ComputeSubnets = []string{"ibm-error-compute-subnet"}
@@ -453,7 +457,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "compute subnet invalid VPC",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.VPCName = "wrong-vpc"
 				},
@@ -467,19 +471,19 @@ func TestValidate(t *testing.T) {
 			name: "compute subnet invalid ResourceGroup",
 			edits: editFunctions{
 				func(ic *types.InstallConfig) {
-					ic.Platform.IBMCloud.ResourceGroupName = "wrong-resource-group"
+					ic.Platform.IBMCloud.NetworkResourceGroupName = wrongRG
 				},
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ComputeSubnets = []string{"valid-subnet"}
 				},
 			},
-			errorMsg: `platform.ibmcloud.computeSubnets: Invalid value: "valid-subnet": computeSubnets contains subnet: valid-subnet, not found in expected resourceGroupName: wrong-resource-group`,
+			errorMsg: `platform.ibmcloud.computeSubnets: Invalid value: "valid-subnet": computeSubnets contains subnet: valid-subnet, not found in expected networkResourceGroupName: wrong-resource-group`,
 		},
 		{
 			name: "compute subnet no zones",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -490,7 +494,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "compute subnet no machinepoolplatform",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -504,7 +508,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "compute subnet invalid zones",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -519,7 +523,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "single compute subnet valid zones some",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -533,7 +537,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "multiple compute subnet invalid zones some",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -555,7 +559,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "multiple compute subnet valid zones some",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -576,7 +580,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "single compute subnet valid zones all",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
@@ -590,7 +594,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "multiple compute subnet valid zones all",
 			edits: editFunctions{
-				validResourceGroupName,
+				validNetworkResourceGroupName,
 				validVPCName,
 				func(ic *types.InstallConfig) {
 					ic.Platform.IBMCloud.ControlPlaneSubnets = []string{validSubnet1Name, validSubnet2Name, validSubnet3Name}
diff --git a/pkg/asset/machines/ibmcloud/machines.go b/pkg/asset/machines/ibmcloud/machines.go
index 5ce95be23be..1af3e5b5e0c 100644
--- a/pkg/asset/machines/ibmcloud/machines.go
+++ b/pkg/asset/machines/ibmcloud/machines.go
@@ -9,9 +9,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	machineapi "github.com/openshift/api/machine/v1beta1"
-	ibmcloudprovider "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	"github.com/openshift/installer/pkg/types"
 	"github.com/openshift/installer/pkg/types/ibmcloud"
+	ibmcloudprovider "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 )
 
 // Machines returns a list of machines for a machinepool.
@@ -89,6 +89,12 @@ func provider(clusterID string,
 		resourceGroup = clusterID
 	}
 
+	// Set the ProviderSpec.NetworkResourceGroup if NetworkResourceGroupName was provided
+	var networkResourceGroup string
+	if platform.NetworkResourceGroupName != "" {
+		networkResourceGroup = platform.NetworkResourceGroupName
+	}
+
 	subnet, err := getSubnet(subnets, clusterID, role, az)
 	if err != nil {
 		return nil, err
@@ -116,14 +122,15 @@ func provider(clusterID string,
 			APIVersion: "ibmcloudproviderconfig.openshift.io/v1beta1",
 			Kind:       "IBMCloudMachineProviderSpec",
 		},
-		VPC:           vpc,
-		DedicatedHost: dedicatedHost,
-		Tags:          []ibmcloudprovider.TagSpecs{},
-		Image:         fmt.Sprintf("%s-rhcos", clusterID),
-		Profile:       mpool.InstanceType,
-		Region:        platform.Region,
-		ResourceGroup: resourceGroup,
-		Zone:          az,
+		VPC:                  vpc,
+		DedicatedHost:        dedicatedHost,
+		Tags:                 []ibmcloudprovider.TagSpecs{},
+		Image:                fmt.Sprintf("%s-rhcos", clusterID),
+		NetworkResourceGroup: networkResourceGroup,
+		Profile:              mpool.InstanceType,
+		Region:               platform.Region,
+		ResourceGroup:        resourceGroup,
+		Zone:                 az,
 		PrimaryNetworkInterface: ibmcloudprovider.NetworkInterface{
 			Subnet:         subnet,
 			SecurityGroups: securityGroups,
diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/master.go
index 3028c371314..c9cd6876201 100644
--- a/pkg/asset/machines/master.go
+++ b/pkg/asset/machines/master.go
@@ -20,8 +20,6 @@ import (
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
 	baremetalapi "github.com/openshift/cluster-api-provider-baremetal/pkg/apis"
 	baremetalprovider "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
-	ibmcloudapi "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis"
-	ibmcloudprovider "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	libvirtapi "github.com/openshift/cluster-api-provider-libvirt/pkg/apis"
 	libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	ovirtproviderapi "github.com/openshift/cluster-api-provider-ovirt/pkg/apis"
@@ -60,6 +58,8 @@ import (
 	ovirttypes "github.com/openshift/installer/pkg/types/ovirt"
 	powervstypes "github.com/openshift/installer/pkg/types/powervs"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
+	ibmcloudapi "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis"
+	ibmcloudprovider "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 )
 
diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go
index c33ca8d3a1d..61895538f57 100644
--- a/pkg/asset/machines/worker.go
+++ b/pkg/asset/machines/worker.go
@@ -19,8 +19,6 @@ import (
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
 	baremetalapi "github.com/openshift/cluster-api-provider-baremetal/pkg/apis"
 	baremetalprovider "github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1"
-	ibmcloudapi "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis"
-	ibmcloudprovider "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	libvirtapi "github.com/openshift/cluster-api-provider-libvirt/pkg/apis"
 	libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	ovirtproviderapi "github.com/openshift/cluster-api-provider-ovirt/pkg/apis"
@@ -60,6 +58,8 @@ import (
 	ovirttypes "github.com/openshift/installer/pkg/types/ovirt"
 	powervstypes "github.com/openshift/installer/pkg/types/powervs"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
+	ibmcloudapi "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis"
+	ibmcloudprovider "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
 )
 
diff --git a/pkg/tfvars/ibmcloud/ibmcloud.go b/pkg/tfvars/ibmcloud/ibmcloud.go
index 2b021ba2b42..389944ac35e 100644
--- a/pkg/tfvars/ibmcloud/ibmcloud.go
+++ b/pkg/tfvars/ibmcloud/ibmcloud.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	ibmcloudprovider "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 	"github.com/openshift/installer/pkg/tfvars/internal/cache"
 	"github.com/openshift/installer/pkg/types"
+	ibmcloudprovider "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 )
 
 // Auth is the collection of credentials that will be used by terrform.
@@ -22,41 +22,43 @@ type DedicatedHost struct {
 }
 
 type config struct {
-	Auth                    `json:",inline"`
-	Region                  string          `json:"ibmcloud_region,omitempty"`
-	BootstrapInstanceType   string          `json:"ibmcloud_bootstrap_instance_type,omitempty"`
-	CISInstanceCRN          string          `json:"ibmcloud_cis_crn,omitempty"`
-	DNSInstanceID           string          `json:"ibmcloud_dns_id,omitempty"`
-	ExtraTags               []string        `json:"ibmcloud_extra_tags,omitempty"`
-	MasterAvailabilityZones []string        `json:"ibmcloud_master_availability_zones"`
-	WorkerAvailabilityZones []string        `json:"ibmcloud_worker_availability_zones"`
-	MasterInstanceType      string          `json:"ibmcloud_master_instance_type,omitempty"`
-	MasterDedicatedHosts    []DedicatedHost `json:"ibmcloud_master_dedicated_hosts,omitempty"`
-	WorkerDedicatedHosts    []DedicatedHost `json:"ibmcloud_worker_dedicated_hosts,omitempty"`
-	PublishStrategy         string          `json:"ibmcloud_publish_strategy,omitempty"`
-	ResourceGroupName       string          `json:"ibmcloud_resource_group_name,omitempty"`
-	ImageFilePath           string          `json:"ibmcloud_image_filepath,omitempty"`
-	PreexistingVPC          bool            `json:"ibmcloud_preexisting_vpc,omitempty"`
-	VPC                     string          `json:"ibmcloud_vpc,omitempty"`
-	VPCPermitted            bool            `json:"ibmcloud_vpc_permitted,omitempty"`
-	ControlPlaneSubnets     []string        `json:"ibmcloud_control_plane_subnets,omitempty"`
-	ComputeSubnets          []string        `json:"ibmcloud_compute_subnets,omitempty"`
+	Auth                     `json:",inline"`
+	Region                   string          `json:"ibmcloud_region,omitempty"`
+	BootstrapInstanceType    string          `json:"ibmcloud_bootstrap_instance_type,omitempty"`
+	CISInstanceCRN           string          `json:"ibmcloud_cis_crn,omitempty"`
+	DNSInstanceID            string          `json:"ibmcloud_dns_id,omitempty"`
+	ExtraTags                []string        `json:"ibmcloud_extra_tags,omitempty"`
+	MasterAvailabilityZones  []string        `json:"ibmcloud_master_availability_zones"`
+	WorkerAvailabilityZones  []string        `json:"ibmcloud_worker_availability_zones"`
+	MasterInstanceType       string          `json:"ibmcloud_master_instance_type,omitempty"`
+	MasterDedicatedHosts     []DedicatedHost `json:"ibmcloud_master_dedicated_hosts,omitempty"`
+	WorkerDedicatedHosts     []DedicatedHost `json:"ibmcloud_worker_dedicated_hosts,omitempty"`
+	PublishStrategy          string          `json:"ibmcloud_publish_strategy,omitempty"`
+	NetworkResourceGroupName string          `json:"ibmcloud_network_resource_group_name,omitempty"`
+	ResourceGroupName        string          `json:"ibmcloud_resource_group_name,omitempty"`
+	ImageFilePath            string          `json:"ibmcloud_image_filepath,omitempty"`
+	PreexistingVPC           bool            `json:"ibmcloud_preexisting_vpc,omitempty"`
+	VPC                      string          `json:"ibmcloud_vpc,omitempty"`
+	VPCPermitted             bool            `json:"ibmcloud_vpc_permitted,omitempty"`
+	ControlPlaneSubnets      []string        `json:"ibmcloud_control_plane_subnets,omitempty"`
+	ComputeSubnets           []string        `json:"ibmcloud_compute_subnets,omitempty"`
 }
 
 // TFVarsSources contains the parameters to be converted into Terraform variables
 type TFVarsSources struct {
-	Auth                 Auth
-	CISInstanceCRN       string
-	DNSInstanceID        string
-	ImageURL             string
-	MasterConfigs        []*ibmcloudprovider.IBMCloudMachineProviderSpec
-	MasterDedicatedHosts []DedicatedHost
-	PreexistingVPC       bool
-	PublishStrategy      types.PublishingStrategy
-	ResourceGroupName    string
-	VPCPermitted         bool
-	WorkerConfigs        []*ibmcloudprovider.IBMCloudMachineProviderSpec
-	WorkerDedicatedHosts []DedicatedHost
+	Auth                     Auth
+	CISInstanceCRN           string
+	DNSInstanceID            string
+	ImageURL                 string
+	MasterConfigs            []*ibmcloudprovider.IBMCloudMachineProviderSpec
+	MasterDedicatedHosts     []DedicatedHost
+	NetworkResourceGroupName string
+	PreexistingVPC           bool
+	PublishStrategy          types.PublishingStrategy
+	ResourceGroupName        string
+	VPCPermitted             bool
+	WorkerConfigs            []*ibmcloudprovider.IBMCloudMachineProviderSpec
+	WorkerDedicatedHosts     []DedicatedHost
 }
 
 // TFVars generates ibmcloud-specific Terraform variables launching the cluster.
@@ -91,24 +93,25 @@ func TFVars(sources TFVarsSources) ([]byte, error) {
 	}
 
 	cfg := &config{
-		Auth:                    sources.Auth,
-		BootstrapInstanceType:   masterConfig.Profile,
-		CISInstanceCRN:          sources.CISInstanceCRN,
-		DNSInstanceID:           sources.DNSInstanceID,
-		ImageFilePath:           cachedImage,
-		MasterAvailabilityZones: masterAvailabilityZones,
-		MasterDedicatedHosts:    sources.MasterDedicatedHosts,
-		MasterInstanceType:      masterConfig.Profile,
-		PublishStrategy:         string(sources.PublishStrategy),
-		Region:                  masterConfig.Region,
-		ResourceGroupName:       sources.ResourceGroupName,
-		WorkerAvailabilityZones: workerAvailabilityZones,
-		WorkerDedicatedHosts:    sources.WorkerDedicatedHosts,
-		PreexistingVPC:          sources.PreexistingVPC,
-		VPC:                     vpc,
-		VPCPermitted:            sources.VPCPermitted,
-		ControlPlaneSubnets:     masterSubnets,
-		ComputeSubnets:          workerSubnets,
+		Auth:                     sources.Auth,
+		BootstrapInstanceType:    masterConfig.Profile,
+		CISInstanceCRN:           sources.CISInstanceCRN,
+		DNSInstanceID:            sources.DNSInstanceID,
+		ImageFilePath:            cachedImage,
+		MasterAvailabilityZones:  masterAvailabilityZones,
+		MasterDedicatedHosts:     sources.MasterDedicatedHosts,
+		MasterInstanceType:       masterConfig.Profile,
+		NetworkResourceGroupName: sources.NetworkResourceGroupName,
+		PublishStrategy:          string(sources.PublishStrategy),
+		Region:                   masterConfig.Region,
+		ResourceGroupName:        sources.ResourceGroupName,
+		WorkerAvailabilityZones:  workerAvailabilityZones,
+		WorkerDedicatedHosts:     sources.WorkerDedicatedHosts,
+		PreexistingVPC:           sources.PreexistingVPC,
+		VPC:                      vpc,
+		VPCPermitted:             sources.VPCPermitted,
+		ControlPlaneSubnets:      masterSubnets,
+		ComputeSubnets:           workerSubnets,
 
 		// TODO: IBM: Future support
 		// ExtraTags:               masterConfig.Tags,
diff --git a/pkg/types/ibmcloud/platform.go b/pkg/types/ibmcloud/platform.go
index 6880a766da5..16444af6cd2 100644
--- a/pkg/types/ibmcloud/platform.go
+++ b/pkg/types/ibmcloud/platform.go
@@ -12,8 +12,14 @@ type Platform struct {
 	// +optional
 	ResourceGroupName string `json:"resourceGroupName,omitempty"`
 
-	// VPCName is the name of an already existing VPC where the cluster should be
-	// installed.
+	// NetworkResourceGroupName is the name of an already existing resource group
+	// where an existing VPC and set of Subnets exist, to be used during cluster
+	// creation.
+	// +optional
+	NetworkResourceGroupName string `json:"networkResourceGroupName,omitempty"`
+
+	// VPCName is the name of an already existing VPC to be used during cluster
+	// creation.
 	// +optional
 	VPCName string `json:"vpcName,omitempty"`
 

From b406fbd167f05c7c7dbe3f4030231cd962f56d12 Mon Sep 17 00:00:00 2001
From: Christopher J Schaefer <cjschaef@us.ibm.com>
Date: Thu, 9 Feb 2023 11:39:37 -0600
Subject: [PATCH 2/2] Update machine-api-provider-ibmcloud packages

Update the go mod and vendor packages to pull in the necessary
IBM Cloud MAPI changes for NetworkResourceGroupName support.
---
 go.mod                                                |  4 ++--
 go.sum                                                |  4 ++--
 .../LICENSE                                           |  0
 .../pkg/apis/addtoschema_ibmcloudprovider_v1.go       |  2 +-
 .../pkg/apis/apis.go                                  |  0
 .../pkg/apis/ibmcloudprovider/v1/doc.go               |  2 +-
 .../v1/ibmcloudproviderconfig_types.go                | 11 ++++++++++-
 .../v1/ibmcloudproviderstatus_types.go                | 10 ++++++++++
 .../pkg/apis/ibmcloudprovider/v1/register.go          |  2 +-
 .../apis/ibmcloudprovider/v1/zz_generated.deepcopy.go |  0
 vendor/modules.txt                                    | 10 +++++-----
 11 files changed, 32 insertions(+), 13 deletions(-)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/LICENSE (100%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/addtoschema_ibmcloudprovider_v1.go (92%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/apis.go (100%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/doc.go (92%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go (83%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go (79%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/register.go (98%)
 rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go (100%)

diff --git a/go.mod b/go.mod
index 0497917fb44..273d579cb12 100644
--- a/go.mod
+++ b/go.mod
@@ -62,11 +62,11 @@ require (
 	github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
 	github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
 	github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e
-	github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0
 	github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c
 	github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519
 	github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a
 	github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b
+	github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1
 	github.com/openshift/machine-config-operator v0.0.0
 	github.com/ovirt/go-ovirt v0.0.0-20210809163552-d4276e35d3db
 	github.com/pborman/uuid v1.2.0
@@ -102,7 +102,7 @@ require (
 	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.90.0
 	k8s.io/utils v0.0.0-20230115233650-391b47cb4029
-	sigs.k8s.io/controller-tools v0.9.2
+	sigs.k8s.io/controller-tools v0.10.0
 	sigs.k8s.io/yaml v1.3.0
 )
 
diff --git a/go.sum b/go.sum
index ed651888531..813c7cc89f0 100644
--- a/go.sum
+++ b/go.sum
@@ -1088,8 +1088,6 @@ github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d055
 github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558/go.mod h1:bgZfB07YK1CBbJRkFE13BHG+k53Qq0IuQyrehZAbv7M=
 github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e h1:FWzYb0sH16yVOyySUwY5yXtZFW/U2bPoK38SEGjC5D8=
 github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e/go.mod h1:Q5WzHV1JZw/XNRnXCo8JfyOSegL13a+lhV4sc44lpSI=
-github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0 h1:G68R/I4HB4F4LawreWxKruqThNpmmXf5DSAsJALc9FY=
-github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0/go.mod h1:CLnQ32mWHZtlQeHX0lYLMA+QTrrdXbg9K8smrWOPXMk=
 github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c h1:gq3EVbCFath848QkE71dMjdBTnzpRoYvD+Nnj2Wp97U=
 github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c/go.mod h1:lApSDY9c9SRjLgLAnwMhyuENQRHR/o1yBtH6RG8GScw=
 github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519 h1:foU7/s6DQczTFdZ/8H++pUC2Pzygqdz5ZgqUakksR5w=
@@ -1102,6 +1100,8 @@ github.com/openshift/library-go v0.0.0-20191003152030-97c62d8a2901/go.mod h1:NBt
 github.com/openshift/library-go v0.0.0-20200831114015-2ab0c61c15de/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ=
 github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b h1:LWwB7uN91G/JsMnZFd0+q6ZzAXlB4/oUOfpZWA585gw=
 github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM=
+github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1 h1:winAA43R7imUj8uzAF7NVs3QWIxheF+rhpRF+O+0/R8=
+github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1/go.mod h1:UDA+gKaUSWbZsKbUbzybyaIqdksOQF5iKc+OsYnHL9k=
 github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 h1:C4gCipkWTDp0B9jb0wZdLgB+HWC7EzVVwQOeNaKnTRA=
 github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8/go.mod h1:fjKreLaKEeUKsyIkT4wlzIQwUVJ2ZKDUh3CI73ckYIY=
 github.com/openshift/runtime-utils v0.0.0-20200415173359-c45d4ff3f912/go.mod h1:0OXNy7VoqFexkxKqyQbHJLPwn1MFp1/CxRJAgKHM+/o=
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/LICENSE b/vendor/github.com/openshift/machine-api-provider-ibmcloud/LICENSE
similarity index 100%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/LICENSE
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/LICENSE
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go
similarity index 92%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go
index 1b1ce0145a7..07d357f9232 100644
--- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go
+++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go
@@ -17,7 +17,7 @@ limitations under the License.
 package apis
 
 import (
-	v1 "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
+	v1 "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1"
 )
 
 func init() {
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/apis.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/apis.go
similarity index 100%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/apis.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/apis.go
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go
similarity index 92%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go
index 6d1eebee741..a8bc8b90646 100644
--- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go
+++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package v1 contains API Schema definitions for the ibmcloudprovider v1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider
+// +k8s:conversion-gen=github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=ibmcloudproviderconfig.openshift.io
 package v1
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go
similarity index 83%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go
index e4173858cf2..666412852e7 100644
--- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go
+++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go
@@ -61,9 +61,18 @@ type IBMCloudMachineProviderSpec struct {
 	// Zone where the virtual server instance will be created
 	Zone string `json:"zone"`
 
-	// ResourceGroup of VPC
+	// ResourceGroup of the machines. This may be the same as NetworkResourceGroup if the machines are
+	// created in the same Resource Group as the network resources.
 	ResourceGroup string `json:"resourceGroup"`
 
+	// NetworkResourceGroup is the Resource Group for network resources like the VPC and Subnets used by the cluster,
+	// where ResourceGroupName will contain the remaining resources (e.g., machines). This may be the same as
+	// ResourceGroup, if the machines are created in the same Resource Group as the network resources.
+	// If empty, the NetworkResourceGroup is considered to be the same value as ResourceGroup, which will contain
+	// the network and remaining resources of the cluster.
+	// (optional)
+	NetworkResourceGroup string `json:"networkResourceGroup,omitempty"`
+
 	// PrimaryNetworkInterface is required to specify subnet
 	PrimaryNetworkInterface NetworkInterface `json:"primaryNetworkInterface"`
 
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go
similarity index 79%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go
index ecd80bfa31c..df6f5f15703 100644
--- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go
+++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go
@@ -50,6 +50,8 @@ const (
 	// MachineCreated indicates whether the machine has been created or not. If not,
 	// it should include a reason and message for the failure.
 	MachineCreated IBMCloudMachineProviderConditionType = "MachineCreated"
+	// MachineReplacement indicates whether the machine is or has been replaced.
+	MachineReplacement IBMCloudMachineProviderConditionType = "MachineReplacement"
 )
 
 // IBMCloudMachineProviderConditionReason is reason for the condition's last transition.
@@ -60,6 +62,14 @@ const (
 	MachineCreationSucceeded IBMCloudMachineProviderConditionReason = "MachineCreationSucceeded"
 	// MachineCreationFailed indicates machine creation failure.
 	MachineCreationFailed IBMCloudMachineProviderConditionReason = "MachineCreationFailed"
+	// MachineReplacementRequested indicates machine replacement was requested.
+	MachineReplacementRequested IBMCloudMachineProviderConditionReason = "MachineReplacementRequested"
+	// MachineReplacementInProgress indicates the machine replacement is in progress
+	MachineReplacementInProgress IBMCloudMachineProviderConditionReason = "MachineReplacementInProgress"
+	// MachineReplacementCompleted indicates the machine replacement completed
+	MachineReplacementCompleted IBMCloudMachineProviderConditionReason = "MachineReplacementCompleted"
+	// MachineReplacementFailed indicates the machine replacement failed
+	MachineReplacementFailed IBMCloudMachineProviderConditionReason = "MachineReplacementFailed"
 )
 
 // IBMCloudMachineProviderCondition is a condition in a IBMCloudMachineProviderStatus.
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go
similarity index 98%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go
index 15121b7e6e9..16a486d2867 100644
--- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go
+++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go
@@ -17,7 +17,7 @@ limitations under the License.
 // Package v1 contains API Schema definitions for the ibmcloudproviderconfig v1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider
+// +k8s:conversion-gen=github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=ibmcloudproviderconfig.openshift.io
 package v1
diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go
similarity index 100%
rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go
rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 574b4a99413..907f4ba06d3 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -8734,10 +8734,6 @@ github.com/openshift/cloud-credential-operator/version
 ## explicit; go 1.17
 github.com/openshift/cluster-api-provider-baremetal/pkg/apis
 github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1
-# github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0
-## explicit; go 1.17
-github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis
-github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1
 # github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c
 ## explicit; go 1.17
 github.com/openshift/cluster-api-provider-libvirt/pkg/apis
@@ -8766,6 +8762,10 @@ github.com/openshift/hive/apis/scheme
 ## explicit; go 1.18
 github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers
 github.com/openshift/library-go/pkg/route/routeapihelpers
+# github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1
+## explicit; go 1.19
+github.com/openshift/machine-api-provider-ibmcloud/pkg/apis
+github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1
 # github.com/openshift/machine-config-operator v0.0.0 => github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8
 ## explicit; go 1.13
 github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1
@@ -9565,7 +9565,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook
 sigs.k8s.io/controller-runtime/pkg/webhook/admission
 sigs.k8s.io/controller-runtime/pkg/webhook/conversion
 sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics
-# sigs.k8s.io/controller-tools v0.9.2 => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185
+# sigs.k8s.io/controller-tools v0.10.0 => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185
 ## explicit; go 1.13
 sigs.k8s.io/controller-tools/cmd/controller-gen
 sigs.k8s.io/controller-tools/pkg/crd