@@ -2,42 +2,44 @@ module openshift/installer/cluster-api/providers/gcp
22
33go 1.21
44
5+ // CAPG replace block: these are taken directly from
6+ // https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/main/go.mod
7+ // & should stay in sync with upstream.
58replace (
6- // match the changes upstream
79 // pinning cel-go due to a breaking change https://github.com/kubernetes/apiserver/issues/97
8- github.com/google/cel-go => github.com/google/cel-go v0.16.1
9- // See https://github.com/openshift/installer/pull/8133
10+ github.com/google/cel-go => github.com/google/cel-go v0.17.7
11+ // kube-openapi should match the version imported by CAPI.
12+ k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
13+ sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0
14+ )
15+
16+ // OpenShift replace block
17+ replace (
18+ // https://issues.redhat.com/browse/OCPBUGS-30642
1019 golang.org/x/oauth2 => golang.org/x/oauth2 v0.15.0
1120 google.golang.org/api => google.golang.org/api v0.157.0
12- // kube-openapi should match the version imported by CAPI.
13- k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
1421)
1522
16- require sigs.k8s.io/cluster-api-provider-gcp v1.6.0
23+ require sigs.k8s.io/cluster-api-provider-gcp v1.6.1-0.20240425114559-a1994e55ab7a
1724
1825require (
19- cloud.google.com/go v0.112.0 // indirect
20- cloud.google.com/go/compute v1.24.0 // indirect
21- cloud.google.com/go/compute/metadata v0.2.3 // indirect
22- cloud.google.com/go/container v1.31 .0 // indirect
23- cloud.google.com/go/iam v1.1.6 // indirect
26+ cloud.google.com/go v0.112.1 // indirect
27+ cloud.google.com/go/compute v1.25.1 // indirect
28+ cloud.google.com/go/compute/metadata v0.3.0 // indirect
29+ cloud.google.com/go/container v1.35 .0 // indirect
30+ cloud.google.com/go/iam v1.1.7 // indirect
2431 cloud.google.com/go/longrunning v0.5.5 // indirect
25- cloud.google.com/go/resourcemanager v1.9.5 // indirect
26- github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0 // indirect
27- github.com/Masterminds/semver/v3 v3.2.1 // indirect
32+ cloud.google.com/go/resourcemanager v1.9.6 // indirect
33+ github.com/GoogleCloudPlatform/k8s-cloud-provider v1.27.0 // indirect
2834 github.com/NYTimes/gziphandler v1.1.1 // indirect
2935 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
30- github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
3136 github.com/beorn7/perks v1.0.1 // indirect
3237 github.com/blang/semver/v4 v4.0.0 // indirect
3338 github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3439 github.com/cespare/xxhash/v2 v2.2.0 // indirect
35- github.com/coreos/go-semver v0.3.1 // indirect
36- github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3740 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38- github.com/emicklei/go-restful/v3 v3.11.0 // indirect
39- github.com/evanphx/json-patch v5.6.0+incompatible // indirect
40- github.com/evanphx/json-patch/v5 v5.8.0 // indirect
41+ github.com/emicklei/go-restful/v3 v3.12.0 // indirect
42+ github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4143 github.com/felixge/httpsnoop v1.0.4 // indirect
4244 github.com/fsnotify/fsnotify v1.7.0 // indirect
4345 github.com/go-logr/logr v1.4.1 // indirect
@@ -48,18 +50,16 @@ require (
4850 github.com/gobuffalo/flect v1.0.2 // indirect
4951 github.com/gogo/protobuf v1.3.2 // indirect
5052 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
51- github.com/golang/protobuf v1.5.3 // indirect
53+ github.com/golang/protobuf v1.5.4 // indirect
5254 github.com/google/cel-go v0.17.7 // indirect
5355 github.com/google/gnostic-models v0.6.8 // indirect
5456 github.com/google/go-cmp v0.6.0 // indirect
5557 github.com/google/gofuzz v1.2.0 // indirect
5658 github.com/google/s2a-go v0.1.7 // indirect
5759 github.com/google/uuid v1.6.0 // indirect
5860 github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
59- github.com/googleapis/gax-go/v2 v2.12.2 // indirect
60- github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
61+ github.com/googleapis/gax-go/v2 v2.12.3 // indirect
6162 github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
62- github.com/huandu/xstrings v1.4.0 // indirect
6363 github.com/imdario/mergo v0.3.13 // indirect
6464 github.com/inconshreveable/mousetrap v1.1.0 // indirect
6565 github.com/josharian/intern v1.0.0 // indirect
@@ -69,7 +69,7 @@ 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.31.1 // indirect
72+ github.com/onsi/gomega v1.33.0 // indirect
7373 github.com/pkg/errors v0.9.1 // indirect
7474 github.com/prometheus/client_golang v1.18.0 // indirect
7575 github.com/prometheus/client_model v0.5.0 // indirect
@@ -78,57 +78,50 @@ require (
7878 github.com/spf13/cobra v1.8.0 // indirect
7979 github.com/spf13/pflag v1.0.5 // indirect
8080 github.com/stoewer/go-strcase v1.2.0 // indirect
81- go.etcd.io/etcd/api/v3 v3.5.10 // indirect
82- go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
83- go.etcd.io/etcd/client/v3 v3.5.10 // indirect
8481 go.opencensus.io v0.24.0 // indirect
85- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48 .0 // indirect
86- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48 .0 // indirect
87- go.opentelemetry.io/otel v1.23 .0 // indirect
88- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20 .0 // indirect
82+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49 .0 // indirect
83+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49 .0 // indirect
84+ go.opentelemetry.io/otel v1.24 .0 // indirect
85+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22 .0 // indirect
8986 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
90- go.opentelemetry.io/otel/metric v1.23 .0 // indirect
91- go.opentelemetry.io/otel/sdk v1.21 .0 // indirect
92- go.opentelemetry.io/otel/trace v1.23 .0 // indirect
87+ go.opentelemetry.io/otel/metric v1.24 .0 // indirect
88+ go.opentelemetry.io/otel/sdk v1.22 .0 // indirect
89+ go.opentelemetry.io/otel/trace v1.24 .0 // indirect
9390 go.opentelemetry.io/proto/otlp v1.0.0 // indirect
94- go.uber.org/multierr v1.11.0 // indirect
95- go.uber.org/zap v1.26.0 // indirect
96- golang.org/x/crypto v0.19.0 // indirect
91+ golang.org/x/crypto v0.22.0 // indirect
9792 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
98- golang.org/x/mod v0.15 .0 // indirect
99- golang.org/x/net v0.21 .0 // indirect
100- golang.org/x/oauth2 v0.17 .0 // indirect
93+ golang.org/x/mod v0.17 .0 // indirect
94+ golang.org/x/net v0.24 .0 // indirect
95+ golang.org/x/oauth2 v0.19 .0 // indirect
10196 golang.org/x/sync v0.6.0 // indirect
102- golang.org/x/sys v0.17 .0 // indirect
103- golang.org/x/term v0.17 .0 // indirect
97+ golang.org/x/sys v0.19 .0 // indirect
98+ golang.org/x/term v0.19 .0 // indirect
10499 golang.org/x/text v0.14.0 // indirect
105100 golang.org/x/time v0.5.0 // indirect
106101 gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
107- google.golang.org/api v0.167 .0 // indirect
102+ google.golang.org/api v0.176 .0 // indirect
108103 google.golang.org/appengine v1.6.8 // indirect
109- google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
110- google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
111- google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
112- google.golang.org/grpc v1.62.0 // indirect
113- google.golang.org/protobuf v1.32 .0 // indirect
104+ google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
105+ google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
106+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
107+ google.golang.org/grpc v1.63.2 // indirect
108+ google.golang.org/protobuf v1.33 .0 // indirect
114109 gopkg.in/inf.v0 v0.9.1 // indirect
115- gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
116110 gopkg.in/yaml.v2 v2.4.0 // indirect
117111 gopkg.in/yaml.v3 v3.0.1 // indirect
118- k8s.io/api v0.28.6 // indirect
119- k8s.io/apiextensions-apiserver v0.28.6 // indirect
120- k8s.io/apimachinery v0.28.6 // indirect
121- k8s.io/apiserver v0.28.6 // indirect
122- k8s.io/client-go v0.28.6 // indirect
123- k8s.io/cluster-bootstrap v0.28.4 // indirect
124- k8s.io/component-base v0.28.6 // indirect
112+ k8s.io/api v0.29.3 // indirect
113+ k8s.io/apiextensions-apiserver v0.29.3 // indirect
114+ k8s.io/apimachinery v0.29.3 // indirect
115+ k8s.io/apiserver v0.29.3 // indirect
116+ k8s.io/client-go v0.29.3 // indirect
117+ k8s.io/cluster-bootstrap v0.29.3 // indirect
118+ k8s.io/component-base v0.29.3 // indirect
125119 k8s.io/klog/v2 v2.110.1 // indirect
126- k8s.io/kms v0.28.6 // indirect
127120 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
128121 k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
129- sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
130- sigs.k8s.io/cluster-api v1.6.2 // indirect
131- sigs.k8s.io/controller-runtime v0.16.5 // indirect
122+ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
123+ sigs.k8s.io/cluster-api v1.7.0 // indirect
124+ sigs.k8s.io/controller-runtime v0.17.3 // indirect
132125 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
133126 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
134127 sigs.k8s.io/yaml v1.4.0 // indirect
0 commit comments