Merge pull request #1857 from spencerhance/bump-cp

Bump k8s-cloud-provider to v1.20.0

go.mod

@@ -3,15 +3,15 @@ module k8s.io/ingress-gce
 go 1.18
 
 require (
-	github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b
-	github.com/google/go-cmp v0.5.6
+	github.com/GoogleCloudPlatform/k8s-cloud-provider v1.20.0
+	github.com/google/go-cmp v0.5.8
 	github.com/kr/pretty v0.2.0
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
-	google.golang.org/api v0.60.0
+	golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
+	google.golang.org/api v0.89.0
 	istio.io/api v0.0.0-20190809125725-591cf32c1d0e
 	k8s.io/api v0.22.2
 	k8s.io/apiextensions-apiserver v0.20.0
@@ -26,20 +26,14 @@ require (
 )
 
 require (
-	cloud.google.com/go v0.97.0 // indirect
+	cloud.google.com/go/compute v1.7.0 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
-	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 // indirect
-	github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
-	github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0 // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
 	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
 	github.com/go-logr/logr v1.2.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -49,7 +43,9 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.4.0 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
@@ -63,16 +59,15 @@ require (
 	github.com/prometheus/common v0.10.0 // indirect
 	github.com/prometheus/procfs v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
-	golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
-	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect
+	golang.org/x/sys v0.0.0-20220624220833-87e55d714810 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211021150943-2b146023228c // indirect
-	google.golang.org/grpc v1.40.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f // indirect
+	google.golang.org/grpc v1.47.0 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

pkg/composite/gen_test.go

@@ -262,6 +262,30 @@ func TestBackendServiceIAPOAuth2ClientInfo(t *testing.T) {
 	}
 }
 
+func TestBackendServiceLocalityLoadBalancingPolicyConfig(t *testing.T) {
+	compositeType := reflect.TypeOf(BackendServiceLocalityLoadBalancingPolicyConfig{})
+	alphaType := reflect.TypeOf(computealpha.BackendServiceLocalityLoadBalancingPolicyConfig{})
+	if err := typeEquality(compositeType, alphaType, true); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestBackendServiceLocalityLoadBalancingPolicyConfigCustomPolicy(t *testing.T) {
+	compositeType := reflect.TypeOf(BackendServiceLocalityLoadBalancingPolicyConfigCustomPolicy{})
+	alphaType := reflect.TypeOf(computealpha.BackendServiceLocalityLoadBalancingPolicyConfigCustomPolicy{})
+	if err := typeEquality(compositeType, alphaType, true); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestBackendServiceLocalityLoadBalancingPolicyConfigPolicy(t *testing.T) {
+	compositeType := reflect.TypeOf(BackendServiceLocalityLoadBalancingPolicyConfigPolicy{})
+	alphaType := reflect.TypeOf(computealpha.BackendServiceLocalityLoadBalancingPolicyConfigPolicy{})
+	if err := typeEquality(compositeType, alphaType, true); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestBackendServiceLogConfig(t *testing.T) {
 	compositeType := reflect.TypeOf(BackendServiceLogConfig{})
 	alphaType := reflect.TypeOf(computealpha.BackendServiceLogConfig{})
@@ -350,6 +374,22 @@ func TestCorsPolicy(t *testing.T) {
 	}
 }
 
+func TestCustomErrorResponsePolicy(t *testing.T) {
+	compositeType := reflect.TypeOf(CustomErrorResponsePolicy{})
+	alphaType := reflect.TypeOf(computealpha.CustomErrorResponsePolicy{})
+	if err := typeEquality(compositeType, alphaType, true); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestCustomErrorResponsePolicyCustomErrorResponseRule(t *testing.T) {
+	compositeType := reflect.TypeOf(CustomErrorResponsePolicyCustomErrorResponseRule{})
+	alphaType := reflect.TypeOf(computealpha.CustomErrorResponsePolicyCustomErrorResponseRule{})
+	if err := typeEquality(compositeType, alphaType, true); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestDuration(t *testing.T) {
 	compositeType := reflect.TypeOf(Duration{})
 	alphaType := reflect.TypeOf(computealpha.Duration{})