diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go index 5c58d0a4cbb..64a4f1b2361 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go @@ -24,9 +24,9 @@ const ( // of cluster nodes as backends instead of all nodes. AlphaFeatureILBSubsets = "ILBSubsets" - // AlphaFeatureNetLBRbs enabled L4 Regional Backend Services and + // AlphaFeatureSkipIGsManagement enabled L4 Regional Backend Services and // disables instance group management in service controller - AlphaFeatureNetLBRbs = "NetLB_RBS" + AlphaFeatureSkipIGsManagement = "SkipIGsManagement" ) // AlphaFeatureGate contains a mapping of alpha features to whether they are enabled diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go index c7c0c91a324..3a40d5cba16 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go @@ -625,7 +625,7 @@ func (g *Cloud) ensureInternalInstanceGroups(name string, nodes []*v1.Node) ([]s klog.V(2).Infof("ensureInternalInstanceGroups(%v): %d nodes over %d zones in region %v", name, len(nodes), len(zonedNodes), g.region) var igLinks []string for zone, nodes := range zonedNodes { - if g.AlphaFeatureGate.Enabled(AlphaFeatureNetLBRbs) { + if g.AlphaFeatureGate.Enabled(AlphaFeatureSkipIGsManagement) { igs, err := g.FilterInstanceGroupsByName(name, zone) if err != nil { return []string{}, err @@ -652,9 +652,10 @@ func (g *Cloud) ensureInternalInstanceGroupsDeleted(name string) error { return err } - klog.V(2).Infof("ensureInternalInstanceGroupsDeleted(%v): attempting delete instance group in all %d zones", name, len(zones)) - for _, z := range zones { - if !g.AlphaFeatureGate.Enabled(AlphaFeatureNetLBRbs) { + // Skip Instance Group deletion if IG management was moved out of k/k code + if !g.AlphaFeatureGate.Enabled(AlphaFeatureSkipIGsManagement) { + klog.V(2).Infof("ensureInternalInstanceGroupsDeleted(%v): attempting delete instance group in all %d zones", name, len(zones)) + for _, z := range zones { if err := g.DeleteInstanceGroup(name, z.Name); err != nil && !isNotFoundOrInUse(err) { return err } diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go index 4ab40628576..15cb6acbbd8 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go @@ -177,9 +177,9 @@ func TestEnsureMultipleInstanceGroups(t *testing.T) { vals := DefaultTestClusterValues() gce, err := fakeGCECloud(vals) require.NoError(t, err) - gce.AlphaFeatureGate = NewAlphaFeatureGate([]string{AlphaFeatureNetLBRbs}) + gce.AlphaFeatureGate = NewAlphaFeatureGate([]string{AlphaFeatureSkipIGsManagement}) - nodes, err := createAndInsertNodes(gce, []string{"n1"}, vals.ZoneName) + nodes, err := createAndInsertNodes(gce, []string{"n1"}, vals.ZoneName) require.NoError(t, err) baseName := makeInstanceGroupName(vals.ClusterID) @@ -560,14 +560,13 @@ func TestSkipInstanceGroupDeletion(t *testing.T) { gce, err := fakeGCECloud(vals) require.NoError(t, err) - svc := fakeLoadbalancerService(string(LBTypeInternal)) svc, err = gce.client.CoreV1().Services(svc.Namespace).Create(context.TODO(), svc, metav1.CreateOptions{}) require.NoError(t, err) _, err = createInternalLoadBalancer(gce, svc, nil, []string{"test-node-1"}, vals.ClusterName, vals.ClusterID, vals.ZoneName) assert.NoError(t, err) - gce.AlphaFeatureGate = NewAlphaFeatureGate([]string{AlphaFeatureNetLBRbs}) + gce.AlphaFeatureGate = NewAlphaFeatureGate([]string{AlphaFeatureSkipIGsManagement}) err = gce.ensureInternalLoadBalancerDeleted(vals.ClusterName, vals.ClusterID, svc) assert.NoError(t, err)