Skip to content

Commit 057aa1a

Browse files
committed
cluster-api/aws: bump capa to latest version
1 parent 9a13ff8 commit 057aa1a

File tree

2 files changed

+183
-215
lines changed

2 files changed

+183
-215
lines changed

cluster-api/providers/aws/go.mod

Lines changed: 55 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ module openshift/installer/cluster-api/providers/aws
22

33
go 1.21
44

5-
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240408095607-ad71a542f8b4
5+
require sigs.k8s.io/cluster-api-provider-aws/v2 v2.4.2-0.20240418073318-b918c3636f5d
66

77
require (
88
github.com/NYTimes/gziphandler v1.1.1 // indirect
99
github.com/alessio/shellescape v1.4.2 // indirect
1010
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
1111
github.com/apparentlymart/go-cidr v1.1.0 // indirect
12-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
1312
github.com/aws/amazon-vpc-cni-k8s v1.15.4 // indirect
1413
github.com/aws/aws-sdk-go v1.45.26 // indirect
1514
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
@@ -21,43 +20,41 @@ require (
2120
github.com/blang/semver v3.5.1+incompatible // indirect
2221
github.com/blang/semver/v4 v4.0.0 // indirect
2322
github.com/briandowns/spinner v1.11.1 // indirect
24-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
25-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
24+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2625
github.com/coreos/go-semver v0.3.1 // indirect
2726
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
2827
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2928
github.com/coreos/ignition v0.35.0 // indirect
3029
github.com/coreos/ignition/v2 v2.16.2 // indirect
3130
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
3231
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
34-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
35-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
32+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
33+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3634
github.com/fatih/color v1.16.0 // indirect
3735
github.com/felixge/httpsnoop v1.0.4 // indirect
38-
github.com/fsnotify/fsnotify v1.6.0 // indirect
36+
github.com/fsnotify/fsnotify v1.7.0 // indirect
3937
github.com/ghodss/yaml v1.0.0 // indirect
4038
github.com/go-errors/errors v1.4.2 // indirect
41-
github.com/go-logr/logr v1.3.0 // indirect
39+
github.com/go-logr/logr v1.4.1 // indirect
4240
github.com/go-logr/stdr v1.2.2 // indirect
43-
github.com/go-logr/zapr v1.2.4 // indirect
41+
github.com/go-logr/zapr v1.3.0 // indirect
4442
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4543
github.com/go-openapi/jsonreference v0.20.2 // indirect
4644
github.com/go-openapi/swag v0.22.3 // indirect
4745
github.com/gobuffalo/flect v1.0.2 // indirect
4846
github.com/gogo/protobuf v1.3.2 // indirect
4947
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
50-
github.com/golang/glog v1.2.0 // indirect
48+
github.com/golang/glog v1.2.1 // indirect
5149
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5250
github.com/golang/mock v1.6.0 // indirect
53-
github.com/golang/protobuf v1.5.3 // indirect
54-
github.com/google/cel-go v0.16.1 // indirect
51+
github.com/golang/protobuf v1.5.4 // indirect
52+
github.com/google/cel-go v0.17.7 // indirect
5553
github.com/google/gnostic-models v0.6.8 // indirect
5654
github.com/google/go-cmp v0.6.0 // indirect
5755
github.com/google/gofuzz v1.2.0 // indirect
5856
github.com/google/uuid v1.6.0 // indirect
5957
github.com/gorilla/css v1.0.1 // indirect
60-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6158
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
6259
github.com/hashicorp/go-version v1.6.0 // indirect
6360
github.com/imdario/mergo v0.3.13 // indirect
@@ -72,15 +69,15 @@ require (
7269
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7370
github.com/modern-go/reflect2 v1.0.2 // indirect
7471
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
75-
github.com/onsi/gomega v1.30.0 // indirect
72+
github.com/onsi/gomega v1.32.0 // indirect
7673
github.com/openshift-online/ocm-common v0.0.0-20240129111424-ff8c6c11d909 // indirect
77-
github.com/openshift-online/ocm-sdk-go v0.1.409 // indirect
74+
github.com/openshift-online/ocm-sdk-go v0.1.414 // indirect
7875
github.com/openshift/rosa v1.2.35-rc1.0.20240301152457-ad986cecd364 // indirect
7976
github.com/pkg/errors v0.9.1 // indirect
80-
github.com/prometheus/client_golang v1.18.0 // indirect
81-
github.com/prometheus/client_model v0.5.0 // indirect
82-
github.com/prometheus/common v0.46.0 // indirect
83-
github.com/prometheus/procfs v0.12.0 // indirect
77+
github.com/prometheus/client_golang v1.19.0 // indirect
78+
github.com/prometheus/client_model v0.6.1 // indirect
79+
github.com/prometheus/common v0.52.2 // indirect
80+
github.com/prometheus/procfs v0.13.0 // indirect
8481
github.com/sirupsen/logrus v1.9.3 // indirect
8582
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
8683
github.com/spf13/cobra v1.8.0 // indirect
@@ -89,58 +86,59 @@ require (
8986
github.com/vincent-petithory/dataurl v1.0.0 // indirect
9087
github.com/zgalor/weberr v0.6.0 // indirect
9188
gitlab.com/c0b/go-ordered-json v0.0.0-20171130231205-49bbdab258c2 // indirect
92-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
93-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
94-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
95-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
9689
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
97-
go.opentelemetry.io/otel v1.20.0 // indirect
98-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
90+
go.opentelemetry.io/otel v1.22.0 // indirect
91+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
9992
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
100-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
101-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
102-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
93+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
94+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
95+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
10396
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
10497
go.uber.org/multierr v1.11.0 // indirect
105-
go.uber.org/zap v1.25.0 // indirect
106-
golang.org/x/crypto v0.18.0 // indirect
98+
go.uber.org/zap v1.26.0 // indirect
99+
golang.org/x/crypto v0.22.0 // indirect
107100
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
108-
golang.org/x/net v0.20.0 // indirect
109-
golang.org/x/oauth2 v0.16.0 // indirect
110-
golang.org/x/sync v0.4.0 // indirect
111-
golang.org/x/sys v0.16.0 // indirect
112-
golang.org/x/term v0.16.0 // indirect
101+
golang.org/x/net v0.24.0 // indirect
102+
golang.org/x/oauth2 v0.19.0 // indirect
103+
golang.org/x/sync v0.6.0 // indirect
104+
golang.org/x/sys v0.19.0 // indirect
105+
golang.org/x/term v0.19.0 // indirect
113106
golang.org/x/text v0.14.0 // indirect
114-
golang.org/x/time v0.3.0 // indirect
107+
golang.org/x/time v0.5.0 // indirect
115108
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
116-
google.golang.org/appengine v1.6.8 // indirect
117-
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
118-
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
119-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
120-
google.golang.org/grpc v1.59.0 // indirect
109+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
110+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
111+
google.golang.org/grpc v1.60.1 // indirect
121112
google.golang.org/protobuf v1.33.0 // indirect
122113
gopkg.in/inf.v0 v0.9.1 // indirect
123-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
124114
gopkg.in/yaml.v2 v2.4.0 // indirect
125115
gopkg.in/yaml.v3 v3.0.1 // indirect
126-
k8s.io/api v0.28.4 // indirect
127-
k8s.io/apiextensions-apiserver v0.28.4 // indirect
128-
k8s.io/apimachinery v0.28.4 // indirect
129-
k8s.io/apiserver v0.28.4 // indirect
130-
k8s.io/client-go v0.28.4 // indirect
131-
k8s.io/cluster-bootstrap v0.28.4 // indirect
132-
k8s.io/component-base v0.28.4 // indirect
133-
k8s.io/klog/v2 v2.100.1 // indirect
134-
k8s.io/kms v0.28.4 // indirect
135-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
116+
k8s.io/api v0.29.3 // indirect
117+
k8s.io/apiextensions-apiserver v0.29.3 // indirect
118+
k8s.io/apimachinery v0.29.3 // indirect
119+
k8s.io/apiserver v0.29.3 // indirect
120+
k8s.io/client-go v0.29.3 // indirect
121+
k8s.io/cluster-bootstrap v0.29.3 // indirect
122+
k8s.io/component-base v0.29.3 // indirect
123+
k8s.io/klog/v2 v2.110.1 // indirect
124+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
136125
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
137-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
126+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
138127
sigs.k8s.io/aws-iam-authenticator v0.6.13 // indirect
139-
sigs.k8s.io/cluster-api v1.6.1 // indirect
140-
sigs.k8s.io/controller-runtime v0.16.3 // indirect
128+
sigs.k8s.io/cluster-api v1.7.0 // indirect
129+
sigs.k8s.io/controller-runtime v0.17.3 // indirect
141130
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
142131
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
143132
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
144-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
133+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
145134
sigs.k8s.io/yaml v1.4.0 // indirect
146135
)
136+
137+
replace (
138+
// TODO: remove when upstream CAPA removes them
139+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
140+
github.com/prometheus/common => github.com/prometheus/common v0.46.0
141+
// kube-openapi should match the version imported by CAPI.
142+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
143+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0
144+
)

0 commit comments

Comments
 (0)