Merge pull request #633 from cezarygerard/master

Rollback PR#598 "Fix ILB deletion by checking for finalizer"

Author: k8s-ci-robot

providers/gce/gce_loadbalancer.go

@@ -279,10 +279,7 @@ func (g *Cloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName strin
 }
 
 func getSvcScheme(svc *v1.Service) cloud.LbScheme {
-	if LBTypeInternal == GetLoadBalancerAnnotationType(svc) {
-		return cloud.SchemeInternal
-	}
-	if hasFinalizer(svc, ILBFinalizerV1) || hasFinalizer(svc, ILBFinalizerV2) {
+	if t := GetLoadBalancerAnnotationType(svc); t == LBTypeInternal {
 		return cloud.SchemeInternal
 	}
 	return cloud.SchemeExternal

providers/gce/gce_loadbalancer_test.go

@@ -183,33 +183,6 @@ func TestEnsureLoadBalancerDeletedDeletesInternalLb(t *testing.T) {
 	assertInternalLbResourcesDeleted(t, gce, apiService, vals, true)
 }
 
-func TestEnsureLoadBalancerDeletedChecksInternalLbFinalizer(t *testing.T) {
-	t.Parallel()
-
-	vals := DefaultTestClusterValues()
-	gce, err := fakeGCECloud(vals)
-	require.NoError(t, err)
-
-	nodeNames := []string{"test-node-1"}
-	_, err = createAndInsertNodes(gce, nodeNames, vals.ZoneName)
-	require.NoError(t, err)
-
-	apiService := fakeLoadbalancerService(string(LBTypeInternal))
-	apiService, err = gce.client.CoreV1().Services(apiService.Namespace).Create(context.TODO(), apiService, metav1.CreateOptions{})
-	require.NoError(t, err)
-	createInternalLoadBalancer(gce, apiService, nil, nodeNames, vals.ClusterName, vals.ClusterID, vals.ZoneName)
-
-	// Read service from apiserver so it has finalizer
-	apiService, err = gce.client.CoreV1().Services(apiService.Namespace).Get(context.TODO(), apiService.Name, metav1.GetOptions{})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	delete(apiService.Annotations, ServiceAnnotationLoadBalancerType)
-	err = gce.EnsureLoadBalancerDeleted(context.Background(), vals.ClusterName, apiService)
-	assert.NoError(t, err)
-	assertInternalLbResourcesDeleted(t, gce, apiService, vals, true)
-}
-
 func TestProjectsBasePath(t *testing.T) {
 	t.Parallel()
 	vals := DefaultTestClusterValues()