Skip to content

Commit

Permalink
feat: add sharedvpc support for lb subnet
Browse files Browse the repository at this point in the history 
fix: set cloudScope for regionalhc and tgttcpproxies

add test for lb w/ shared vpc

add more test cases
  • Loading branch information
@swarren83
swarren83 authored and Shawn Warren committed Jul 2, 2024
1 parent 3c2e7de commit 0f16b9e
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 7 deletions.
134 changes: 130 additions & 4 deletions cloud/services/compute/loadbalancers/reconcile_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@ func getBaseClusterScopeWithLabels() (*scope.ClusterScope, error) {
return clusterScope, nil
}

func getBaseClusterScopeWithSharedVPC() (*scope.ClusterScope, error) {
clusterScope, err := getBaseClusterScope()
if err != nil {
return nil, err
}

clusterScope.GCPCluster.Spec.Network.HostProject = ptr.To("my-shared-vpc-project")
return clusterScope, nil
}

func TestService_createOrGetInstanceGroup(t *testing.T) {
tests := []struct {
name string
Expand Down Expand Up @@ -243,6 +253,7 @@ 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)",
Expand All @@ -269,11 +280,43 @@ 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()
clusterScope, err := getBaseClusterScope()
var err error
var clusterScope *scope.ClusterScope
if tt.sharedVPC {
clusterScope, err = getBaseClusterScopeWithSharedVPC()
} else {
clusterScope, err = getBaseClusterScope()
}
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -451,6 +494,7 @@ func TestService_createOrGetAddress(t *testing.T) {
mockAddress *cloud.MockGlobalAddresses
want *compute.Address
wantErr bool
sharedVPC bool
}{
{
name: "address does not exist for external load balancer (should create address)",
Expand All @@ -467,11 +511,33 @@ func TestService_createOrGetAddress(t *testing.T) {
AddressType: "EXTERNAL",
},
},
{
name: "address does not exist for external load balancer in shared VPC (should create address)",
scope: func(s *scope.ClusterScope) Scope { return s },
lbName: infrav1.APIServerRoleTagValue,
mockAddress: &cloud.MockGlobalAddresses{
ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
Objects: map[meta.Key]*cloud.MockGlobalAddressesObj{},
},
want: &compute.Address{
IpVersion: "IPV4",
Name: "my-cluster-apiserver",
SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/global/addresses/my-cluster-apiserver",
AddressType: "EXTERNAL",
},
sharedVPC: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx := context.TODO()
clusterScope, err := getBaseClusterScope()
var err error
var clusterScope *scope.ClusterScope
if tt.sharedVPC {
clusterScope, err = getBaseClusterScopeWithSharedVPC()
} else {
clusterScope, err = getBaseClusterScope()
}
if err != nil {
t.Fatal(err)
}
Expand All @@ -498,6 +564,7 @@ func TestService_createOrGetInternalAddress(t *testing.T) {
mockSubnetworks *cloud.MockSubnetworks
want *compute.Address
wantErr bool
sharedVPC bool
}{
{
name: "address does not exist for internal load balancer (should create address)",
Expand Down Expand Up @@ -527,11 +594,46 @@ func TestService_createOrGetInternalAddress(t *testing.T) {
Purpose: "GCE_ENDPOINT",
},
},
{
name: "address does not exist for internal load balancer using SharedVPC subnet (should create address)",
scope: func(s *scope.ClusterScope) Scope {
s.GCPCluster.Spec.LoadBalancer = infrav1.LoadBalancerSpec{
LoadBalancerType: &lbTypeInternal,
}
return s
},
lbName: infrav1.InternalRoleTagValue,
mockAddress: &cloud.MockAddresses{
ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
Objects: map[meta.Key]*cloud.MockAddressesObj{},
},
mockSubnetworks: &cloud.MockSubnetworks{
ProjectRouter: &cloud.SingleProjectRouter{ID: "proj-id"},
Objects: map[meta.Key]*cloud.MockSubnetworksObj{
*meta.RegionalKey("control-plane", "us-central1"): {},
},
},
want: &compute.Address{
IpVersion: "IPV4",
Name: "my-cluster-api-internal",
Region: "us-central1",
SelfLink: "https://www.googleapis.com/compute/v1/projects/proj-id/regions/us-central1/addresses/my-cluster-api-internal",
AddressType: "INTERNAL",
Purpose: "GCE_ENDPOINT",
},
sharedVPC: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx := context.TODO()
clusterScope, err := getBaseClusterScope()
var err error
var clusterScope *scope.ClusterScope
if tt.sharedVPC {
clusterScope, err = getBaseClusterScopeWithSharedVPC()
} else {
clusterScope, err = getBaseClusterScope()
}
if err != nil {
t.Fatal(err)
}
Expand All @@ -558,6 +660,7 @@ 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)",
Expand All @@ -575,11 +678,34 @@ 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()
clusterScope, err := getBaseClusterScope()
var err error
var clusterScope *scope.ClusterScope
if tt.sharedVPC {
clusterScope, err = getBaseClusterScopeWithSharedVPC()
} else {
clusterScope, err = getBaseClusterScope()
}
if err != nil {
t.Fatal(err)
}
Expand Down
11 changes: 8 additions & 3 deletions cloud/services/compute/loadbalancers/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ var _ cloud.Reconciler = &Service{}

// New returns Service from given scope.
func New(scope Scope) *Service {
cloudScope := scope.Cloud()
if scope.IsSharedVpc() {
cloudScope = scope.NetworkCloud()
}

return &Service{
scope: scope,
addresses: scope.Cloud().GlobalAddresses(),
Expand All @@ -110,9 +115,9 @@ func New(scope Scope) *Service {
forwardingrules: scope.Cloud().GlobalForwardingRules(),
regionalforwardingrules: scope.Cloud().ForwardingRules(),
healthchecks: scope.Cloud().HealthChecks(),
regionalhealthchecks: scope.Cloud().RegionHealthChecks(),
regionalhealthchecks: cloudScope.RegionHealthChecks(),
instancegroups: scope.Cloud().InstanceGroups(),
targettcpproxies: scope.Cloud().TargetTcpProxies(),
subnets: scope.Cloud().Subnetworks(),
targettcpproxies: cloudScope.TargetTcpProxies(),
subnets: cloudScope.Subnetworks(),
}
}

0 comments on commit 0f16b9e

Please sign in to comment.