Skip to content

Commit 8b0a8a2

Browse files
committed
Updating CAPG in the cluster-api/providers/gcp directory
to ensure ensure that all versions for CAPG are the same.
1 parent c12b61c commit 8b0a8a2

File tree

1,975 files changed

+281795
-163604
lines changed

Some content is hidden

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

1,975 files changed

+281795
-163604
lines changed

cluster-api/providers/gcp/go.mod

Lines changed: 70 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
module openshift/installer/cluster-api/providers/gcp
22

3-
go 1.22.0
3+
go 1.23.7
44

5-
toolchain go1.23.4
5+
toolchain go1.24.2
66

77
// CAPG replace block: these are taken directly from
88
// https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/main/go.mod
99
// & should stay in sync with upstream.
1010
replace (
1111
// cel-go should match the version imported by CAPI.
12-
github.com/google/cel-go => github.com/google/cel-go v0.20.1
12+
github.com/google/cel-go => github.com/google/cel-go v0.22.0
1313
// kube-openapi should match the version imported by CAPI.
1414
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
15-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.4
15+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.3
1616
)
1717

18-
require sigs.k8s.io/cluster-api-provider-gcp v1.8.1-0.20250225090028-d80bfabadd3f
18+
require sigs.k8s.io/cluster-api-provider-gcp v1.10.1-0.20251016125449-c2c9fb21d6e5
1919

2020
require (
21-
cloud.google.com/go v0.116.0 // indirect
22-
cloud.google.com/go/auth v0.13.0 // indirect
23-
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
24-
cloud.google.com/go/compute v1.31.1 // indirect
25-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
26-
cloud.google.com/go/container v1.42.0 // indirect
27-
cloud.google.com/go/iam v1.2.2 // indirect
28-
cloud.google.com/go/longrunning v0.6.2 // indirect
29-
cloud.google.com/go/resourcemanager v1.10.2 // indirect
30-
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.33.0 // indirect
21+
cel.dev/expr v0.20.0 // indirect
22+
cloud.google.com/go v0.121.2 // indirect
23+
cloud.google.com/go/auth v0.16.1 // indirect
24+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
25+
cloud.google.com/go/compute v1.39.0 // indirect
26+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
27+
cloud.google.com/go/container v1.42.4 // indirect
28+
cloud.google.com/go/iam v1.5.2 // indirect
29+
cloud.google.com/go/longrunning v0.6.7 // indirect
30+
cloud.google.com/go/resourcemanager v1.10.6 // indirect
31+
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.34.0 // indirect
3132
github.com/NYTimes/gziphandler v1.1.1 // indirect
3233
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3334
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
@@ -36,30 +37,29 @@ require (
3637
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3738
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3839
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
39-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
40-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
40+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
41+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4142
github.com/felixge/httpsnoop v1.0.4 // indirect
42-
github.com/fsnotify/fsnotify v1.7.0 // indirect
43+
github.com/fsnotify/fsnotify v1.8.0 // indirect
4344
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
44-
github.com/go-logr/logr v1.4.2 // indirect
45+
github.com/go-logr/logr v1.4.3 // indirect
4546
github.com/go-logr/stdr v1.2.2 // indirect
46-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
47+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4748
github.com/go-openapi/jsonreference v0.20.2 // indirect
48-
github.com/go-openapi/swag v0.22.4 // indirect
49+
github.com/go-openapi/swag v0.23.0 // indirect
4950
github.com/gobuffalo/flect v1.0.3 // indirect
5051
github.com/gogo/protobuf v1.3.2 // indirect
51-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5252
github.com/golang/protobuf v1.5.4 // indirect
53-
github.com/google/cel-go v0.20.1 // indirect
53+
github.com/google/btree v1.1.3 // indirect
54+
github.com/google/cel-go v0.22.0 // indirect
5455
github.com/google/gnostic-models v0.6.8 // indirect
55-
github.com/google/go-cmp v0.6.0 // indirect
56+
github.com/google/go-cmp v0.7.0 // indirect
5657
github.com/google/gofuzz v1.2.0 // indirect
57-
github.com/google/s2a-go v0.1.8 // indirect
58+
github.com/google/s2a-go v0.1.9 // indirect
5859
github.com/google/uuid v1.6.0 // indirect
59-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
60-
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
60+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
61+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
6162
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
62-
github.com/imdario/mergo v0.3.13 // indirect
6363
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6464
github.com/josharian/intern v1.0.0 // indirect
6565
github.com/json-iterator/go v1.1.12 // indirect
@@ -69,59 +69,61 @@ require (
6969
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7070
github.com/modern-go/reflect2 v1.0.2 // indirect
7171
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
72-
github.com/onsi/gomega v1.36.2 // indirect
72+
github.com/onsi/gomega v1.37.0 // indirect
7373
github.com/pkg/errors v0.9.1 // indirect
7474
github.com/prometheus/client_golang v1.20.4 // indirect
7575
github.com/prometheus/client_model v0.6.1 // indirect
7676
github.com/prometheus/common v0.59.1 // indirect
7777
github.com/prometheus/procfs v0.15.1 // indirect
78-
github.com/spf13/cobra v1.8.1 // indirect
79-
github.com/spf13/pflag v1.0.5 // indirect
80-
github.com/stoewer/go-strcase v1.2.0 // indirect
78+
github.com/spf13/cobra v1.9.1 // indirect
79+
github.com/spf13/pflag v1.0.6 // indirect
80+
github.com/stoewer/go-strcase v1.3.0 // indirect
8181
github.com/x448/float16 v0.8.4 // indirect
82-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
83-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
84-
go.opentelemetry.io/otel v1.29.0 // indirect
82+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
85+
go.opentelemetry.io/otel v1.35.0 // indirect
8586
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
8687
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
87-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
88-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
89-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
88+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
89+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
90+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
9091
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
91-
golang.org/x/crypto v0.32.0 // indirect
92+
golang.org/x/crypto v0.38.0 // indirect
9293
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
93-
golang.org/x/mod v0.22.0 // indirect
94-
golang.org/x/net v0.34.0 // indirect
95-
golang.org/x/oauth2 v0.24.0 // indirect
96-
golang.org/x/sync v0.10.0 // indirect
97-
golang.org/x/sys v0.29.0 // indirect
98-
golang.org/x/term v0.28.0 // indirect
99-
golang.org/x/text v0.21.0 // indirect
100-
golang.org/x/time v0.8.0 // indirect
101-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
102-
google.golang.org/api v0.214.0 // indirect
103-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
104-
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
106-
google.golang.org/grpc v1.67.3 // indirect
107-
google.golang.org/protobuf v1.36.1 // indirect
94+
golang.org/x/mod v0.24.0 // indirect
95+
golang.org/x/net v0.40.0 // indirect
96+
golang.org/x/oauth2 v0.30.0 // indirect
97+
golang.org/x/sync v0.14.0 // indirect
98+
golang.org/x/sys v0.33.0 // indirect
99+
golang.org/x/term v0.32.0 // indirect
100+
golang.org/x/text v0.25.0 // indirect
101+
golang.org/x/time v0.11.0 // indirect
102+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
103+
google.golang.org/api v0.235.0 // indirect
104+
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
107+
google.golang.org/grpc v1.72.2 // indirect
108+
google.golang.org/protobuf v1.36.6 // indirect
109+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
108110
gopkg.in/inf.v0 v0.9.1 // indirect
109111
gopkg.in/yaml.v2 v2.4.0 // indirect
110112
gopkg.in/yaml.v3 v3.0.1 // indirect
111-
k8s.io/api v0.31.3 // indirect
112-
k8s.io/apiextensions-apiserver v0.31.3 // indirect
113-
k8s.io/apimachinery v0.31.3 // indirect
114-
k8s.io/apiserver v0.31.3 // indirect
115-
k8s.io/client-go v0.31.3 // indirect
116-
k8s.io/cluster-bootstrap v0.31.3 // indirect
117-
k8s.io/component-base v0.31.3 // indirect
113+
k8s.io/api v0.32.3 // indirect
114+
k8s.io/apiextensions-apiserver v0.32.3 // indirect
115+
k8s.io/apimachinery v0.32.3 // indirect
116+
k8s.io/apiserver v0.32.3 // indirect
117+
k8s.io/client-go v0.32.3 // indirect
118+
k8s.io/cluster-bootstrap v0.32.3 // indirect
119+
k8s.io/component-base v0.32.3 // indirect
118120
k8s.io/klog/v2 v2.130.1 // indirect
119-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
120-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
121-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
122-
sigs.k8s.io/cluster-api v1.9.4 // indirect
123-
sigs.k8s.io/controller-runtime v0.19.4 // indirect
124-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
125-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
121+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
122+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
123+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
124+
sigs.k8s.io/cluster-api v1.10.3 // indirect
125+
sigs.k8s.io/controller-runtime v0.20.4 // indirect
126+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
127+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
126128
sigs.k8s.io/yaml v1.4.0 // indirect
127129
)

0 commit comments

Comments
 (0)