revert regionlhc and targettcpproxies

kubernetes-sigs · Jul 11, 2024 · e6001db · e6001db
1 parent 76f3b00
commit e6001db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 61 deletions.
diff --git a/cloud/services/compute/loadbalancers/reconcile_test.go b/cloud/services/compute/loadbalancers/reconcile_test.go
@@ -253,7 +253,6 @@ func TestService_createOrGetRegionalHealthCheck(t *testing.T) {
 		mockHealthChecks *cloud.MockRegionHealthChecks
 		want             *compute.HealthCheck
 		wantErr          bool
-		sharedVPC        bool
 	}{
 		{
 			name: "regional health check does not exist for internal load balancer (should create healthcheck)",
@@ -280,43 +279,11 @@ func TestService_createOrGetRegionalHealthCheck(t *testing.T) {
 				UnhealthyThreshold: 3,
 			},
 		},
-		{
-			name: "regional health check does not exist for internal load balancer in shared VPC (should create healthcheck)",
-			scope: func(s *scope.ClusterScope) Scope {
-				s.GCPCluster.Spec.LoadBalancer = infrav1.LoadBalancerSpec{
-					LoadBalancerType: &lbTypeInternal,
-				}
-				return s
-			},
-			lbName: infrav1.InternalRoleTagValue,
-			mockHealthChecks: &cloud.MockRegionHealthChecks{
-				ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
-				Objects:       map[meta.Key]*cloud.MockRegionHealthChecksObj{},
-			},
-			want: &compute.HealthCheck{
-				CheckIntervalSec:   10,
-				HealthyThreshold:   5,
-				HttpsHealthCheck:   &compute.HTTPSHealthCheck{Port: 6443, PortSpecification: "USE_FIXED_PORT", RequestPath: "/readyz"},
-				Name:               "my-cluster-api-internal",
-				Region:             "us-central1",
-				SelfLink:           "https://www.googleapis.com/compute/v1/projects/proj-id/regions/us-central1/healthChecks/my-cluster-api-internal",
-				TimeoutSec:         5,
-				Type:               "HTTPS",
-				UnhealthyThreshold: 3,
-			},
-			sharedVPC: true,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.TODO()
-			var err error
-			var clusterScope *scope.ClusterScope
-			if tt.sharedVPC {
-				clusterScope, err = getBaseClusterScopeWithSharedVPC()
-			} else {
-				clusterScope, err = getBaseClusterScope()
-			}
+			clusterScope, err := getBaseClusterScope()
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -660,7 +627,6 @@ func TestService_createOrGetTargetTCPProxy(t *testing.T) {
 		mockTargetTCPProxy *cloud.MockTargetTcpProxies
 		want               *compute.TargetTcpProxy
 		wantErr            bool
-		sharedVPC          bool
 	}{
 		{
 			name:  "target tcp proxy does not exist for external load balancer (should create target tp proxy)",
@@ -678,34 +644,11 @@ func TestService_createOrGetTargetTCPProxy(t *testing.T) {
 				SelfLink:    "https://www.googleapis.com/compute/v1/projects/proj-id/global/targetTcpProxies/my-cluster-apiserver",
 			},
 		},
-		{
-			name:  "target tcp proxy does not exist for external load balancer in shared VPC (should create target tp proxy)",
-			scope: func(s *scope.ClusterScope) Scope { return s },
-			backendService: &compute.BackendService{
-				Name: "my-cluster-api-internal",
-			},
-			mockTargetTCPProxy: &cloud.MockTargetTcpProxies{
-				ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
-				Objects:       map[meta.Key]*cloud.MockTargetTcpProxiesObj{},
-			},
-			want: &compute.TargetTcpProxy{
-				Name:        "my-cluster-apiserver",
-				ProxyHeader: "NONE",
-				SelfLink:    "https://www.googleapis.com/compute/v1/projects/proj-id/global/targetTcpProxies/my-cluster-apiserver",
-			},
-			sharedVPC: true,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.TODO()
-			var err error
-			var clusterScope *scope.ClusterScope
-			if tt.sharedVPC {
-				clusterScope, err = getBaseClusterScopeWithSharedVPC()
-			} else {
-				clusterScope, err = getBaseClusterScope()
-			}
+			clusterScope, err := getBaseClusterScope()
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/cloud/services/compute/loadbalancers/service.go b/cloud/services/compute/loadbalancers/service.go
@@ -115,9 +115,9 @@ func New(scope Scope) *Service {
 		forwardingrules:         scope.Cloud().GlobalForwardingRules(),
 		regionalforwardingrules: scope.Cloud().ForwardingRules(),
 		healthchecks:            scope.Cloud().HealthChecks(),
-		regionalhealthchecks:    cloudScope.RegionHealthChecks(),
+		regionalhealthchecks:    scope.Cloud().RegionHealthChecks(),
 		instancegroups:          scope.Cloud().InstanceGroups(),
-		targettcpproxies:        cloudScope.TargetTcpProxies(),
+		targettcpproxies:        scope.Cloud().TargetTcpProxies(),
 		subnets:                 cloudScope.Subnetworks(),
 	}
 }