manifests/gcp/cluster: set instance group role tag

Sets the instance group role tag to "master" to be consistent with
the role tag expected by MAPI--rather than "apiserver" used by CAPI.

Author: patrickdillon

pkg/asset/manifests/gcp/cluster.go

@@ -19,13 +19,14 @@ import (
 	"github.com/openshift/installer/pkg/types/gcp"
 )
 
+// InstanceGroupRoleTag is the tag used in the instance
+// group name to maintain compatibility between MAPI & CAPI.
+const InstanceGroupRoleTag = "master"
+
 // GenerateClusterAssets generates the manifests for the cluster-api.
 func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID *installconfig.ClusterID) (*capiutils.GenerateClusterAssetsOutput, error) {
 	manifests := []*asset.RuntimeFile{}
-
-	const (
-		description = "Created By OpenShift Installer"
-	)
+	const description = "Created By OpenShift Installer"
 
 	networkName := fmt.Sprintf("%s-network", clusterID.InfraID)
 	if installConfig.Config.GCP.Network != "" {
@@ -118,6 +119,9 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 			},
 			AdditionalLabels: labels,
 			FailureDomains:   findFailureDomains(installConfig),
+			LoadBalancer: capg.LoadBalancerSpec{
+				APIServerInstanceGroupTagOverride: ptr.To(InstanceGroupRoleTag),
+			},
 		},
 	}
 	gcpCluster.SetGroupVersionKind(capg.GroupVersion.WithKind("GCPCluster"))

pkg/infrastructure/gcp/clusterapi/network.go

@@ -8,6 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/api/compute/v1"
 
+	"github.com/openshift/installer/pkg/asset/manifests/gcp"
 	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
 )
 
@@ -130,7 +131,7 @@ func createInternalLB(ctx context.Context, in clusterapi.InfraReadyInput, subnet
 	}
 	backends := []*compute.Backend{}
 	for _, zone := range zones {
-		igName := fmt.Sprintf("%s-apiserver-%s", in.InfraID, *zone)
+		igName := fmt.Sprintf("%s-%s-%s", in.InfraID, gcp.InstanceGroupRoleTag, *zone)
 		ig, err := service.InstanceGroups.Get(projectID, *zone, igName).Context(ctx).Do()
 		if err != nil {
 			return "", fmt.Errorf("error getting instance group %s in zone %s: %w", igName, *zone, err)