github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Applied review comments

Browse Source
This commit is contained in:
Cezary Zawdka 2022-01-11 15:40:12 +01:00 committed by Cezary Zawadka
parent f2e29bf4f0
commit c92b922798
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go
View File

@ -24,9 +24,9 @@ const (
// of cluster nodes as backends instead of all nodes. // of cluster nodes as backends instead of all nodes.
AlphaFeatureILBSubsets = "ILBSubsets" AlphaFeatureILBSubsets = "ILBSubsets"
// AlphaFeatureNetLBRbs enabled L4 Regional Backend Services and // AlphaFeatureSkipIGsManagement enabled L4 Regional Backend Services and
// disables instance group management in service controller // disables instance group management in service controller
AlphaFeatureNetLBRbs = "NetLB_RBS" AlphaFeatureSkipIGsManagement = "SkipIGsManagement"
) )
// AlphaFeatureGate contains a mapping of alpha features to whether they are enabled // AlphaFeatureGate contains a mapping of alpha features to whether they are enabled

9
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go
View File

@ -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) klog.V(2).Infof("ensureInternalInstanceGroups(%v): %d nodes over %d zones in region %v", name, len(nodes), len(zonedNodes), g.region)
var igLinks []string var igLinks []string
for zone, nodes := range zonedNodes { for zone, nodes := range zonedNodes {
if g.AlphaFeatureGate.Enabled(AlphaFeatureNetLBRbs) { if g.AlphaFeatureGate.Enabled(AlphaFeatureSkipIGsManagement) {
igs, err := g.FilterInstanceGroupsByName(name, zone) igs, err := g.FilterInstanceGroupsByName(name, zone)
if err != nil { if err != nil {
return []string{}, err return []string{}, err
@ -652,9 +652,10 @@ func (g *Cloud) ensureInternalInstanceGroupsDeleted(name string) error {
return err return err
} }
klog.V(2).Infof("ensureInternalInstanceGroupsDeleted(%v): attempting delete instance group in all %d zones", name, len(zones)) // Skip Instance Group deletion if IG management was moved out of k/k code
for _, z := range zones { if !g.AlphaFeatureGate.Enabled(AlphaFeatureSkipIGsManagement) {
if !g.AlphaFeatureGate.Enabled(AlphaFeatureNetLBRbs) { 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) { if err := g.DeleteInstanceGroup(name, z.Name); err != nil && !isNotFoundOrInUse(err) {
return err return err
} }

7
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go
View File

@ -177,9 +177,9 @@ func TestEnsureMultipleInstanceGroups(t *testing.T) {
vals := DefaultTestClusterValues() vals := DefaultTestClusterValues()
gce, err := fakeGCECloud(vals) gce, err := fakeGCECloud(vals)
require.NoError(t, err) 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) require.NoError(t, err)
baseName := makeInstanceGroupName(vals.ClusterID) baseName := makeInstanceGroupName(vals.ClusterID)
@ -560,14 +560,13 @@ func TestSkipInstanceGroupDeletion(t *testing.T) {
gce, err := fakeGCECloud(vals) gce, err := fakeGCECloud(vals)
require.NoError(t, err) require.NoError(t, err)
svc := fakeLoadbalancerService(string(LBTypeInternal)) svc := fakeLoadbalancerService(string(LBTypeInternal))
svc, err = gce.client.CoreV1().Services(svc.Namespace).Create(context.TODO(), svc, metav1.CreateOptions{}) svc, err = gce.client.CoreV1().Services(svc.Namespace).Create(context.TODO(), svc, metav1.CreateOptions{})
require.NoError(t, err) require.NoError(t, err)
_, err = createInternalLoadBalancer(gce, svc, nil, []string{"test-node-1"}, vals.ClusterName, vals.ClusterID, vals.ZoneName) _, err = createInternalLoadBalancer(gce, svc, nil, []string{"test-node-1"}, vals.ClusterName, vals.ClusterID, vals.ZoneName)
assert.NoError(t, err) assert.NoError(t, err)
gce.AlphaFeatureGate = NewAlphaFeatureGate([]string{AlphaFeatureNetLBRbs}) gce.AlphaFeatureGate = NewAlphaFeatureGate([]string{AlphaFeatureSkipIGsManagement})
err = gce.ensureInternalLoadBalancerDeleted(vals.ClusterName, vals.ClusterID, svc) err = gce.ensureInternalLoadBalancerDeleted(vals.ClusterName, vals.ClusterID, svc)
assert.NoError(t, err) assert.NoError(t, err)