Merge pull request openshift#7696 from mjturek/remove-ccon

MULTIARCH-3789: Power VS: Remove cloud connection support

Author: openshift-merge-bot[bot]

data/data/powervs/cluster/power_network/pi_network.tf

@@ -8,32 +8,15 @@ data "ibm_pi_dhcps" "dhcp_services" {
 }
 
 resource "ibm_pi_dhcp" "new_dhcp_service" {
-  count                  = 1
-  pi_cloud_instance_id   = var.cloud_instance_id
-  pi_cloud_connection_id = var.transit_gateway_enabled ? "" : data.ibm_pi_cloud_connection.cloud_connection[count.index].id
-  pi_cidr                = var.machine_cidr
-  pi_dns_server          = var.dns_server
-  pi_dhcp_snat_enabled   = var.enable_snat
+  count                = 1
+  pi_cloud_instance_id = var.cloud_instance_id
+  pi_cidr              = var.machine_cidr
+  pi_dns_server        = var.dns_server
+  pi_dhcp_snat_enabled = var.enable_snat
   # the pi_dhcp_name param will be prefixed by the DHCP ID when created, so keep it short here:
   pi_dhcp_name = var.cluster_id
 }
 
-resource "ibm_pi_cloud_connection" "new_cloud_connection" {
-  count                              = var.transit_gateway_enabled ? 0 : 1
-  pi_cloud_instance_id               = var.cloud_instance_id
-  pi_cloud_connection_name           = "cloud-con-${var.cluster_id}"
-  pi_cloud_connection_speed          = 50
-  pi_cloud_connection_global_routing = true
-  pi_cloud_connection_vpc_enabled    = true
-  pi_cloud_connection_vpc_crns       = [var.vpc_crn]
-}
-
-data "ibm_pi_cloud_connection" "cloud_connection" {
-  count                    = var.transit_gateway_enabled ? 0 : 1
-  pi_cloud_connection_name = ibm_pi_cloud_connection.new_cloud_connection[0].pi_cloud_connection_name
-  pi_cloud_instance_id     = var.cloud_instance_id
-}
-
 data "ibm_pi_dhcp" "dhcp_service" {
   pi_cloud_instance_id = var.cloud_instance_id
   pi_dhcp_id           = ibm_pi_dhcp.new_dhcp_service[0].dhcp_id

data/data/powervs/cluster/power_network/variables.tf

@@ -18,12 +18,6 @@ variable "vpc_crn" {
   description = "The CRN of the IBM Cloud VPC."
 }
 
-variable "cloud_conn_name" {
-  type        = string
-  description = "The name of a pre-created Power VS Cloud connection."
-  default     = ""
-}
-
 variable "machine_cidr" {
   type        = string
   description = "The machine network (IPv4 only)"

pkg/asset/installconfig/powervs/session.go

@@ -18,7 +18,6 @@ import (
 	"github.com/IBM-Cloud/bluemix-go/http"
 	"github.com/IBM-Cloud/bluemix-go/rest"
 	bxsession "github.com/IBM-Cloud/bluemix-go/session"
-	"github.com/IBM-Cloud/power-go-client/clients/instance"
 	"github.com/IBM-Cloud/power-go-client/ibmpisession"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/form3tech-oss/jwt-go"
@@ -250,46 +249,6 @@ func (c *BxClient) ValidateAccountPermissions() error {
 	return nil
 }
 
-// ValidateCloudConnectionInPowerVSRegion counts cloud connection in PowerVS Region
-func (c *BxClient) ValidateCloudConnectionInPowerVSRegion(ctx context.Context, svcInsID string) error {
-	ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
-	defer cancel()
-
-	var cloudConnectionsIDs []string
-
-	cloudConnectionClient := instance.NewIBMPICloudConnectionClient(ctx, c.PISession, svcInsID)
-
-	//check number of cloudconnections
-	getAllResp, err := cloudConnectionClient.GetAll()
-	if err != nil {
-		return fmt.Errorf("failed to get existing Cloud connection details: %w", err)
-	}
-
-	if len(getAllResp.CloudConnections) >= 2 {
-		return fmt.Errorf("cannot create new Cloud connection in Power VS. Only two Cloud connections are allowed per zone")
-	}
-
-	for _, cc := range getAllResp.CloudConnections {
-		cloudConnectionsIDs = append(cloudConnectionsIDs, *cc.CloudConnectionID)
-	}
-
-	//check for Cloud connection attached to DHCP Service
-	for _, cc := range cloudConnectionsIDs {
-		cloudConn, err := cloudConnectionClient.Get(cc)
-		if err != nil {
-			return fmt.Errorf("failed to get Cloud connection details: %w", err)
-		}
-		if cloudConn != nil {
-			for _, nw := range cloudConn.Networks {
-				if nw.DhcpManaged {
-					return fmt.Errorf("only one Cloud connection can be attached to any DHCP network per account per zone")
-				}
-			}
-		}
-	}
-	return nil
-}
-
 // NewPISession updates pisession details, return error on fail.
 func (c *BxClient) NewPISession() error {
 	var authenticator core.Authenticator = &core.IamAuthenticator{

pkg/destroy/powervs/cloudconnection.go

@@ -156,21 +156,20 @@ type ClusterUninstaller struct {
 	VPCRegion      string
 	Zone           string
 
-	managementSvc         *resourcemanagerv2.ResourceManagerV2
-	controllerSvc         *resourcecontrollerv2.ResourceControllerV2
-	vpcSvc                *vpcv1.VpcV1
-	zonesSvc              *zonesv1.ZonesV1
-	dnsRecordsSvc         *dnsrecordsv1.DnsRecordsV1
-	dnsZonesSvc           *dnszonesv1.DnsZonesV1
-	resourceRecordsSvc    *resourcerecordsv1.ResourceRecordsV1
-	piSession             *ibmpisession.IBMPISession
-	instanceClient        *instance.IBMPIInstanceClient
-	imageClient           *instance.IBMPIImageClient
-	jobClient             *instance.IBMPIJobClient
-	keyClient             *instance.IBMPIKeyClient
-	cloudConnectionClient *instance.IBMPICloudConnectionClient
-	dhcpClient            *instance.IBMPIDhcpClient
-	tgClient              *transitgatewayapisv1.TransitGatewayApisV1
+	managementSvc      *resourcemanagerv2.ResourceManagerV2
+	controllerSvc      *resourcecontrollerv2.ResourceControllerV2
+	vpcSvc             *vpcv1.VpcV1
+	zonesSvc           *zonesv1.ZonesV1
+	dnsRecordsSvc      *dnsrecordsv1.DnsRecordsV1
+	dnsZonesSvc        *dnszonesv1.DnsZonesV1
+	resourceRecordsSvc *resourcerecordsv1.ResourceRecordsV1
+	piSession          *ibmpisession.IBMPISession
+	instanceClient     *instance.IBMPIInstanceClient
+	imageClient        *instance.IBMPIImageClient
+	jobClient          *instance.IBMPIJobClient
+	keyClient          *instance.IBMPIKeyClient
+	dhcpClient         *instance.IBMPIDhcpClient
+	tgClient           *transitgatewayapisv1.TransitGatewayApisV1
 
 	resourceGroupID string
 	cosInstanceID   string
@@ -312,8 +311,6 @@ func (o *ClusterUninstaller) destroyCluster() error {
 		{name: "Public Gateways", execute: o.destroyPublicGateways},
 	}, {
 		{name: "DHCPs", execute: o.destroyDHCPNetworks},
-	}, {
-		{name: "Cloud Connections", execute: o.destroyCloudConnections},
 	}, {
 		{name: "Images", execute: o.destroyImages},
 		{name: "VPCs", execute: o.destroyVPCs},
@@ -468,7 +465,6 @@ func (o *ClusterUninstaller) loadSDKServices() error {
 		o.Logger.Debugf("loadSDKServices: o.imageClient = %v", o.imageClient)
 		o.Logger.Debugf("loadSDKServices: o.jobClient = %v", o.jobClient)
 		o.Logger.Debugf("loadSDKServices: o.keyClient = %v", o.keyClient)
-		o.Logger.Debugf("loadSDKServices: o.cloudConnectionClient = %v", o.cloudConnectionClient)
 		o.Logger.Debugf("loadSDKServices: o.vpcSvc = %v", o.vpcSvc)
 		o.Logger.Debugf("loadSDKServices: o.managementSvc = %v", o.managementSvc)
 		o.Logger.Debugf("loadSDKServices: o.controllerSvc = %v", o.controllerSvc)
@@ -719,11 +715,6 @@ func (o *ClusterUninstaller) loadSDKServices() error {
 		return fmt.Errorf("loadSDKServices: o.keyClient is nil")
 	}
 
-	o.cloudConnectionClient = instance.NewIBMPICloudConnectionClient(context.Background(), o.piSession, o.ServiceGUID)
-	if o.cloudConnectionClient == nil {
-		return fmt.Errorf("loadSDKServices: o.cloudConnectionClient is nil")
-	}
-
 	o.dhcpClient = instance.NewIBMPIDhcpClient(context.Background(), o.piSession, o.ServiceGUID)
 	if o.dhcpClient == nil {
 		return fmt.Errorf("loadSDKServices: o.dhcpClient is nil")

pkg/destroy/powervs/powervs.go

@@ -22,16 +22,6 @@ var Regions = map[string]Region{
 		VPCRegion:   "us-south",
 		Zones:       []string{"dal10"},
 	},
-	"mon": {
-		Description: "Montreal, Canada",
-		VPCRegion:   "ca-tor",
-		Zones:       []string{"mon01"},
-	},
-	"osa": {
-		Description: "Osaka, Japan",
-		VPCRegion:   "jp-osa",
-		Zones:       []string{"osa21"},
-	},
 }
 
 // VPCRegionForPowerVSRegion returns the VPC region for the specified PowerVS region.