Skip to content

Commit

Permalink
Merge pull request #56 from nrb/revert-ilb-deletion
Browse files Browse the repository at this point in the history 
OCPBUGS-25947: Fix changing load balancer scope
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] committed Jan 4, 2024
2 parents b4b418c + 3e8f7a3 commit 118209d
Show file tree
Hide file tree
Showing 704 changed files with 599,586 additions and 276,124 deletions.
29 changes: 15 additions & 14 deletions go.mod
View file
Expand Up @@ -5,14 +5,14 @@ go 1.19
require (
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/gofrs/flock v0.7.1
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/google/go-tpm v0.3.2
github.com/prometheus/client_golang v1.16.0
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.2
golang.org/x/oauth2 v0.8.0
google.golang.org/api v0.114.0
golang.org/x/oauth2 v0.13.0
google.golang.org/api v0.151.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/warnings.v0 v0.1.2
k8s.io/api v0.28.0
Expand Down Expand Up @@ -42,20 +42,21 @@ require (
)

require (
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go/compute v1.23.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.25.0
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
Expand All @@ -80,8 +81,8 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/cel-go v0.16.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/google/uuid v1.4.0
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/imdario/mergo v0.3.11 // indirect
Expand Down Expand Up @@ -124,16 +125,16 @@ require (
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sync v0.2.0
golang.org/x/sync v0.5.0
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.8.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
206 changes: 33 additions & 173 deletions go.sum
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions providers/gce/gce_instances_test.go
View file
Expand Up @@ -137,7 +137,7 @@ func TestNodeAddresses(t *testing.T) {

mockGCE := gce.c.(*cloud.MockGCE)
mi := mockGCE.Instances().(*cloud.MockInstances)
mi.GetHook = func(ctx context.Context, key *meta.Key, m *cloud.MockInstances) (bool, *ga.Instance, error) {
mi.GetHook = func(ctx context.Context, key *meta.Key, m *cloud.MockInstances, options ...cloud.Option) (bool, *ga.Instance, error) {
ret, ok := instanceMap[key.Name]
if !ok {
return true, nil, fmt.Errorf("instance not found")
Expand Down Expand Up @@ -275,7 +275,7 @@ func TestAliasRangesByProviderID(t *testing.T) {

mockGCE := gce.c.(*cloud.MockGCE)
mai := mockGCE.Instances().(*cloud.MockInstances)
mai.GetHook = func(ctx context.Context, key *meta.Key, m *cloud.MockInstances) (bool, *ga.Instance, error) {
mai.GetHook = func(ctx context.Context, key *meta.Key, m *cloud.MockInstances, options ...cloud.Option) (bool, *ga.Instance, error) {
ret, ok := instanceMap[key.Name]
if !ok {
return true, nil, fmt.Errorf("instance not found")
Expand Down Expand Up @@ -363,7 +363,7 @@ func TestInstanceByProviderID(t *testing.T) {

mockGCE := gce.c.(*cloud.MockGCE)
mai := mockGCE.Instances().(*cloud.MockInstances)
mai.GetHook = func(ctx context.Context, key *meta.Key, m *cloud.MockInstances) (bool, *ga.Instance, error) {
mai.GetHook = func(ctx context.Context, key *meta.Key, m *cloud.MockInstances, options ...cloud.Option) (bool, *ga.Instance, error) {
ret, ok := instanceMap[key.Name]
if !ok {
return true, nil, fmt.Errorf("instance not found")
Expand Down
5 changes: 1 addition & 4 deletions providers/gce/gce_loadbalancer.go
View file
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions providers/gce/gce_loadbalancer_external_test.go
View file
Expand Up @@ -921,7 +921,7 @@ func TestFirewallNeedsUpdate(t *testing.T) {
ports []v1.ServicePort
ipnet utilnet.IPNetSet
fwIPProtocol string
getHook func(context.Context, *meta.Key, *cloud.MockFirewalls) (bool, *compute.Firewall, error)
getHook func(context.Context, *meta.Key, *cloud.MockFirewalls, ...cloud.Option) (bool, *compute.Firewall, error)
sourceRange string
exists bool
needsUpdate bool
Expand Down Expand Up @@ -1029,7 +1029,7 @@ func TestFirewallNeedsUpdate(t *testing.T) {
ports: svc.Spec.Ports,
ipnet: ipnet,
fwIPProtocol: "tcp",
getHook: func(ctx context.Context, key *meta.Key, m *cloud.MockFirewalls) (bool, *compute.Firewall, error) {
getHook: func(ctx context.Context, key *meta.Key, m *cloud.MockFirewalls, options ...cloud.Option) (bool, *compute.Firewall, error) {
obj, ok := m.Objects[*key]
if !ok {
return false, nil, nil
Expand All @@ -1053,7 +1053,7 @@ func TestFirewallNeedsUpdate(t *testing.T) {
ports: svc.Spec.Ports,
ipnet: ipnet,
fwIPProtocol: "tcp",
getHook: func(ctx context.Context, key *meta.Key, m *cloud.MockFirewalls) (bool, *compute.Firewall, error) {
getHook: func(ctx context.Context, key *meta.Key, m *cloud.MockFirewalls, options ...cloud.Option) (bool, *compute.Firewall, error) {
obj, ok := m.Objects[*key]
if !ok {
return false, nil, nil
Expand All @@ -1077,7 +1077,7 @@ func TestFirewallNeedsUpdate(t *testing.T) {
ports: svc.Spec.Ports,
ipnet: ipnet,
fwIPProtocol: "tcp",
getHook: func(ctx context.Context, key *meta.Key, m *cloud.MockFirewalls) (bool, *compute.Firewall, error) {
getHook: func(ctx context.Context, key *meta.Key, m *cloud.MockFirewalls, options ...cloud.Option) (bool, *compute.Firewall, error) {
obj, ok := m.Objects[*key]
if !ok {
return false, nil, nil
Expand Down Expand Up @@ -1451,7 +1451,7 @@ func TestExternalLoadBalancerEnsureHttpHealthCheck(t *testing.T) {
gce, err := fakeGCECloud(DefaultTestClusterValues())
require.NoError(t, err)
c := gce.c.(*cloud.MockGCE)
c.MockHttpHealthChecks.UpdateHook = func(ctx context.Context, key *meta.Key, obj *compute.HttpHealthCheck, m *cloud.MockHttpHealthChecks) error {
c.MockHttpHealthChecks.UpdateHook = func(ctx context.Context, key *meta.Key, obj *compute.HttpHealthCheck, m *cloud.MockHttpHealthChecks, options ...cloud.Option) error {
m.Objects[*key] = &cloud.MockHttpHealthChecksObj{Obj: obj}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion providers/gce/gce_loadbalancer_internal_test.go
View file
Expand Up @@ -1950,7 +1950,7 @@ func TestEnsureInternalLoadBalancerModifyProtocol(t *testing.T) {
gce, err := fakeGCECloud(vals)
require.NoError(t, err)
c := gce.c.(*cloud.MockGCE)
c.MockRegionBackendServices.UpdateHook = func(ctx context.Context, key *meta.Key, be *compute.BackendService, m *cloud.MockRegionBackendServices) error {
c.MockRegionBackendServices.UpdateHook = func(ctx context.Context, key *meta.Key, be *compute.BackendService, m *cloud.MockRegionBackendServices, options ...cloud.Option) error {
// Same key can be used since FR will have the same name.
fr, err := c.MockForwardingRules.Get(ctx, key)
if err != nil && !isNotFound(err) {
Expand Down
27 changes: 0 additions & 27 deletions providers/gce/gce_loadbalancer_test.go
View file
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions providers/gce/gce_util.go
View file
Expand Up @@ -96,7 +96,7 @@ func registerTargetPoolAddInstanceHook(gce *Cloud, callback func(*compute.Target
return fmt.Errorf("couldn't cast cloud to mockGCE: %#v", gce)
}
existingHandler := mockGCE.MockTargetPools.AddInstanceHook
hook := func(ctx context.Context, key *meta.Key, req *compute.TargetPoolsAddInstanceRequest, m *cloud.MockTargetPools) error {
hook := func(ctx context.Context, key *meta.Key, req *compute.TargetPoolsAddInstanceRequest, m *cloud.MockTargetPools, options ...cloud.Option) error {
callback(req)
return existingHandler(ctx, key, req, m)
}
Expand All @@ -110,7 +110,7 @@ func registerTargetPoolRemoveInstanceHook(gce *Cloud, callback func(*compute.Tar
return fmt.Errorf("couldn't cast cloud to mockGCE: %#v", gce)
}
existingHandler := mockGCE.MockTargetPools.RemoveInstanceHook
hook := func(ctx context.Context, key *meta.Key, req *compute.TargetPoolsRemoveInstanceRequest, m *cloud.MockTargetPools) error {
hook := func(ctx context.Context, key *meta.Key, req *compute.TargetPoolsRemoveInstanceRequest, m *cloud.MockTargetPools, options ...cloud.Option) error {
callback(req)
return existingHandler(ctx, key, req, m)
}
Expand Down
32 changes: 17 additions & 15 deletions providers/go.mod
View file
Expand Up @@ -3,11 +3,11 @@ module k8s.io/cloud-provider-gcp/providers
go 1.19

require (
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3
github.com/google/go-cmp v0.5.9
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.25.0
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.8.2
golang.org/x/oauth2 v0.8.0
google.golang.org/api v0.114.0
golang.org/x/oauth2 v0.13.0
google.golang.org/api v0.151.0
gopkg.in/gcfg.v1 v1.2.0
gopkg.in/warnings.v0 v0.1.1 // indirect
k8s.io/api v0.28.0
Expand All @@ -24,7 +24,7 @@ require (
)

require (
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go/compute v1.23.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -40,9 +40,10 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -58,15 +59,16 @@ require (
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down

0 comments on commit 118209d

Please sign in to comment.