Skip to content

Commit 0e9c95c

Browse files
authored
Merge pull request #2012 from shiftstack/capi-v1.7
🌱 Bump CAPI to v1.7.0
2 parents a5e83f2 + 2877d01 commit 0e9c95c

File tree

2 files changed

+150
-553
lines changed

2 files changed

+150
-553
lines changed

go.mod

Lines changed: 43 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ go 1.22
44

55
require (
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
7-
github.com/go-logr/logr v1.3.0
7+
github.com/go-logr/logr v1.4.1
88
github.com/golang/mock v1.6.0
99
github.com/google/go-cmp v0.6.0
1010
github.com/google/gofuzz v1.2.0
11-
github.com/google/uuid v1.3.1
11+
github.com/google/uuid v1.4.0
1212
github.com/gophercloud/gophercloud v1.7.0
1313
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56
1414
github.com/hashicorp/go-version v1.4.0
15-
github.com/onsi/ginkgo/v2 v2.15.0
16-
github.com/onsi/gomega v1.30.0
17-
github.com/prometheus/client_golang v1.17.0
15+
github.com/onsi/ginkgo/v2 v2.17.1
16+
github.com/onsi/gomega v1.32.0
17+
github.com/prometheus/client_golang v1.18.0
1818
github.com/spf13/pflag v1.0.5
19-
golang.org/x/crypto v0.16.0
19+
golang.org/x/crypto v0.21.0
2020
golang.org/x/text v0.14.0
2121
gopkg.in/ini.v1 v1.67.0
2222
k8s.io/api v0.29.3
@@ -26,10 +26,10 @@ require (
2626
k8s.io/component-base v0.29.3
2727
k8s.io/klog/v2 v2.110.1
2828
k8s.io/kubernetes v1.28.3
29-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
30-
sigs.k8s.io/cluster-api v1.6.0
31-
sigs.k8s.io/cluster-api/test v1.6.0
32-
sigs.k8s.io/controller-runtime v0.16.3
29+
k8s.io/utils v0.0.0-20231127182322-b307cd553661
30+
sigs.k8s.io/cluster-api v1.7.0
31+
sigs.k8s.io/cluster-api/test v1.7.0
32+
sigs.k8s.io/controller-runtime v0.17.3
3333
sigs.k8s.io/yaml v1.4.0
3434
)
3535

@@ -51,22 +51,19 @@ require (
5151
github.com/blang/semver/v4 v4.0.0 // indirect
5252
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5353
github.com/cespare/xxhash/v2 v2.2.0 // indirect
54-
github.com/cloudflare/circl v1.3.3 // indirect
55-
github.com/coreos/go-semver v0.3.1 // indirect
56-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
54+
github.com/cloudflare/circl v1.3.7 // indirect
5755
github.com/distribution/reference v0.5.0 // indirect
58-
github.com/docker/distribution v2.8.3+incompatible // indirect
59-
github.com/docker/docker v24.0.7+incompatible // indirect
60-
github.com/docker/go-connections v0.4.0 // indirect
56+
github.com/docker/docker v25.0.5+incompatible // indirect
57+
github.com/docker/go-connections v0.5.0 // indirect
6158
github.com/docker/go-units v0.5.0 // indirect
6259
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
63-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
64-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
65-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
60+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
61+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
62+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6663
github.com/felixge/httpsnoop v1.0.4 // indirect
6764
github.com/fsnotify/fsnotify v1.7.0 // indirect
6865
github.com/go-logr/stdr v1.2.2 // indirect
69-
github.com/go-logr/zapr v1.2.4 // indirect
66+
github.com/go-logr/zapr v1.3.0 // indirect
7067
github.com/go-openapi/jsonpointer v0.19.6 // indirect
7168
github.com/go-openapi/jsonreference v0.20.2 // indirect
7269
github.com/go-openapi/swag v0.22.3 // indirect
@@ -81,7 +78,6 @@ require (
8178
github.com/google/go-querystring v1.1.0 // indirect
8279
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
8380
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
84-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
8581
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
8682
github.com/hashicorp/go-uuid v1.0.3 // indirect
8783
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -93,7 +89,7 @@ require (
9389
github.com/magiconair/properties v1.8.7 // indirect
9490
github.com/mailru/easyjson v0.7.7 // indirect
9591
github.com/mattn/go-isatty v0.0.20 // indirect
96-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
92+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
9793
github.com/mitchellh/copystructure v1.2.0 // indirect
9894
github.com/mitchellh/go-homedir v1.1.0 // indirect
9995
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -106,60 +102,53 @@ require (
106102
github.com/pelletier/go-toml v1.9.5 // indirect
107103
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
108104
github.com/pkg/errors v0.9.1 // indirect
109-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
110-
github.com/prometheus/common v0.44.0 // indirect
111-
github.com/prometheus/procfs v0.11.1 // indirect
112-
github.com/sagikazarmark/locafero v0.3.0 // indirect
105+
github.com/prometheus/client_model v0.5.0 // indirect
106+
github.com/prometheus/common v0.45.0 // indirect
107+
github.com/prometheus/procfs v0.12.0 // indirect
108+
github.com/sagikazarmark/locafero v0.4.0 // indirect
113109
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
114110
github.com/shopspring/decimal v1.3.1 // indirect
115111
github.com/sourcegraph/conc v0.3.0 // indirect
116-
github.com/spf13/afero v1.10.0 // indirect
117-
github.com/spf13/cast v1.5.1 // indirect
112+
github.com/spf13/afero v1.11.0 // indirect
113+
github.com/spf13/cast v1.6.0 // indirect
118114
github.com/spf13/cobra v1.8.0 // indirect
119-
github.com/spf13/viper v1.17.0 // indirect
115+
github.com/spf13/viper v1.18.2 // indirect
120116
github.com/stoewer/go-strcase v1.3.0 // indirect
121117
github.com/subosito/gotenv v1.6.0 // indirect
122118
github.com/valyala/fastjson v1.6.4 // indirect
123-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
124-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
125-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
126-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
127119
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
128-
go.opentelemetry.io/otel v1.20.0 // indirect
129-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
120+
go.opentelemetry.io/otel v1.22.0 // indirect
121+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
130122
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
131-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
132-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
133-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
123+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
124+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
125+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
134126
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
135127
go.uber.org/multierr v1.11.0 // indirect
136-
go.uber.org/zap v1.25.0 // indirect
128+
go.uber.org/zap v1.26.0 // indirect
137129
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
138130
golang.org/x/mod v0.14.0 // indirect
139-
golang.org/x/net v0.19.0 // indirect
140-
golang.org/x/oauth2 v0.14.0 // indirect
141-
golang.org/x/sync v0.5.0 // indirect
142-
golang.org/x/sys v0.15.0 // indirect
143-
golang.org/x/term v0.15.0 // indirect
144-
golang.org/x/time v0.3.0 // indirect
145-
golang.org/x/tools v0.16.1 // indirect
131+
golang.org/x/net v0.23.0 // indirect
132+
golang.org/x/oauth2 v0.18.0 // indirect
133+
golang.org/x/sync v0.6.0 // indirect
134+
golang.org/x/sys v0.18.0 // indirect
135+
golang.org/x/term v0.18.0 // indirect
136+
golang.org/x/time v0.5.0 // indirect
137+
golang.org/x/tools v0.17.0 // indirect
146138
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
147-
google.golang.org/appengine v1.6.7 // indirect
148-
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
149-
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
150-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
151-
google.golang.org/grpc v1.59.0 // indirect
139+
google.golang.org/appengine v1.6.8 // indirect
140+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
142+
google.golang.org/grpc v1.60.1 // indirect
152143
google.golang.org/protobuf v1.33.0 // indirect
153144
gopkg.in/inf.v0 v0.9.1 // indirect
154-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
155145
gopkg.in/yaml.v2 v2.4.0 // indirect
156146
gopkg.in/yaml.v3 v3.0.1 // indirect
157147
k8s.io/apiserver v0.29.3 // indirect
158148
k8s.io/cluster-bootstrap v0.29.3 // indirect
159-
k8s.io/kms v0.29.3 // indirect
160149
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
161150
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
162151
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
163-
sigs.k8s.io/kind v0.20.0 // indirect
152+
sigs.k8s.io/kind v0.22.0 // indirect
164153
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
165154
)

0 commit comments

Comments
 (0)