Skip to content

Commit 94f312b

Browse files
committed
WIP: Upgrade to latest cluster-api-provider-gcp
This picks up fix for shared VPC and labels, particularly: kubernetes-sigs/cluster-api-provider-gcp#1280 kubernetes-sigs/cluster-api-provider-gcp#1277 kubernetes-sigs/cluster-api-provider-gcp#1275
1 parent 8e548c3 commit 94f312b

File tree

705 files changed

+712417
-954182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

705 files changed

+712417
-954182
lines changed

cluster-api/providers/gcp/go.mod

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,25 @@ replace (
1313
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0
1414
)
1515

16-
// OpenShift replace block
17-
replace (
18-
// https://issues.redhat.com/browse/OCPBUGS-30642
19-
golang.org/x/oauth2 => golang.org/x/oauth2 v0.15.0
20-
google.golang.org/api => google.golang.org/api v0.157.0
21-
)
22-
23-
require sigs.k8s.io/cluster-api-provider-gcp v1.7.0
16+
require sigs.k8s.io/cluster-api-provider-gcp v1.7.1-0.20240724153512-c3b8b533143c
2417

2518
require (
26-
cloud.google.com/go v0.114.0 // indirect
27-
cloud.google.com/go/compute v1.27.0 // indirect
28-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
29-
cloud.google.com/go/container v1.37.0 // indirect
30-
cloud.google.com/go/iam v1.1.8 // indirect
31-
cloud.google.com/go/longrunning v0.5.7 // indirect
32-
cloud.google.com/go/resourcemanager v1.9.7 // indirect
33-
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.30.0 // indirect
19+
cloud.google.com/go v0.115.0 // indirect
20+
cloud.google.com/go/auth v0.7.2 // indirect
21+
cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
22+
cloud.google.com/go/compute v1.27.3 // indirect
23+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
24+
cloud.google.com/go/container v1.37.3 // indirect
25+
cloud.google.com/go/iam v1.1.11 // indirect
26+
cloud.google.com/go/longrunning v0.5.9 // indirect
27+
cloud.google.com/go/resourcemanager v1.9.10 // indirect
28+
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.31.0 // indirect
3429
github.com/NYTimes/gziphandler v1.1.1 // indirect
3530
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3631
github.com/beorn7/perks v1.0.1 // indirect
3732
github.com/blang/semver/v4 v4.0.0 // indirect
3833
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
39-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
34+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4035
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4136
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
4237
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -58,7 +53,7 @@ require (
5853
github.com/google/s2a-go v0.1.7 // indirect
5954
github.com/google/uuid v1.6.0 // indirect
6055
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
61-
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
56+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
6257
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
6358
github.com/imdario/mergo v0.3.13 // indirect
6459
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -88,24 +83,23 @@ require (
8883
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
8984
go.opentelemetry.io/otel/trace v1.24.0 // indirect
9085
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
91-
golang.org/x/crypto v0.24.0 // indirect
86+
golang.org/x/crypto v0.25.0 // indirect
9287
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
93-
golang.org/x/mod v0.18.0 // indirect
94-
golang.org/x/net v0.26.0 // indirect
88+
golang.org/x/mod v0.19.0 // indirect
89+
golang.org/x/net v0.27.0 // indirect
9590
golang.org/x/oauth2 v0.21.0 // indirect
9691
golang.org/x/sync v0.7.0 // indirect
97-
golang.org/x/sys v0.21.0 // indirect
98-
golang.org/x/term v0.21.0 // indirect
92+
golang.org/x/sys v0.22.0 // indirect
93+
golang.org/x/term v0.22.0 // indirect
9994
golang.org/x/text v0.16.0 // indirect
10095
golang.org/x/time v0.5.0 // indirect
10196
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
102-
google.golang.org/api v0.184.0 // indirect
103-
google.golang.org/appengine v1.6.8 // indirect
104-
google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
107-
google.golang.org/grpc v1.64.0 // indirect
108-
google.golang.org/protobuf v1.34.1 // indirect
97+
google.golang.org/api v0.189.0 // indirect
98+
google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect
99+
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect
101+
google.golang.org/grpc v1.65.0 // indirect
102+
google.golang.org/protobuf v1.34.2 // indirect
109103
gopkg.in/inf.v0 v0.9.1 // indirect
110104
gopkg.in/yaml.v2 v2.4.0 // indirect
111105
gopkg.in/yaml.v3 v3.0.1 // indirect

cluster-api/providers/gcp/go.sum

Lines changed: 53 additions & 1970 deletions
Large diffs are not rendered by default.

cluster-api/providers/gcp/vendor/cloud.google.com/go/.release-please-manifest-individual.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/gcp/vendor/cloud.google.com/go/.release-please-manifest-submodules.json

Lines changed: 16 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/gcp/vendor/cloud.google.com/go/.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/gcp/vendor/cloud.google.com/go/CHANGES.md

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)