Skip to content

Commit 2d435e0

Browse files
authored
Merge pull request #8355 from jackfrancis/ca-1.31.3-deps
Update deps for CA 1.31.3 release
2 parents bec784a + 878f092 commit 2d435e0

File tree

6 files changed

+319
-339
lines changed

6 files changed

+319
-339
lines changed

cluster-autoscaler/apis/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module k8s.io/autoscaler/cluster-autoscaler/apis
22

3-
go 1.22.0
3+
go 1.22.12
44

55
require (
66
github.com/onsi/ginkgo/v2 v2.19.0
77
github.com/onsi/gomega v1.33.1
8-
k8s.io/apimachinery v0.31.7
9-
k8s.io/client-go v0.31.7
10-
k8s.io/code-generator v0.31.7
8+
k8s.io/apimachinery v0.31.11
9+
k8s.io/client-go v0.31.11
10+
k8s.io/code-generator v0.31.11
1111
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
1212
)
1313

@@ -50,7 +50,7 @@ require (
5050
gopkg.in/inf.v0 v0.9.1 // indirect
5151
gopkg.in/yaml.v2 v2.4.0 // indirect
5252
gopkg.in/yaml.v3 v3.0.1 // indirect
53-
k8s.io/api v0.31.7 // indirect
53+
k8s.io/api v0.31.11 // indirect
5454
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
5555
k8s.io/klog/v2 v2.130.1 // indirect
5656
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect

cluster-autoscaler/apis/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
140140
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
141141
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
142142
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
143-
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
144-
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
145-
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
146-
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
147-
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
148-
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
149-
k8s.io/code-generator v0.31.7 h1:8BU7n+pK8td2600IiqH6EgxuiWbwVA1+uTOwIJ/nTUA=
150-
k8s.io/code-generator v0.31.7/go.mod h1:1oSRo6cJxwSCghcOFGsh53TKkUQ5ZgYoK7LBCFbhHDg=
143+
k8s.io/api v0.31.11 h1:jmrs+NBmdyaYMOIhAmi2g2eemugqiMwRSKtdpk0FAFc=
144+
k8s.io/api v0.31.11/go.mod h1:t1/N5KEcY/DCwEzCbtCoJeJt4b00phLCRVgM11Ijb6o=
145+
k8s.io/apimachinery v0.31.11 h1:QsYPEVrKOTBtuzj0gmfwVkM7RwPB+IbOUceBAuK4ips=
146+
k8s.io/apimachinery v0.31.11/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
147+
k8s.io/client-go v0.31.11 h1:uhc+e8vfsGtm9xVoIs0+ajGW0mWNW64VSjej3bXF+WA=
148+
k8s.io/client-go v0.31.11/go.mod h1:y11StjQTOP0nd/o/RHxqwmdr1CWdBvnpvGs9k7MWYnA=
149+
k8s.io/code-generator v0.31.11 h1:sMujjnYawMNBK4Qr1KywKHq53IpEGDaoOHydiWF1B2E=
150+
k8s.io/code-generator v0.31.11/go.mod h1:tHtGfr99EkUxXM3PqjXetuDXqB40tns5/KwjtTKZBkc=
151151
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
152152
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
153153
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
Lines changed: 71 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
module k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test
22

3-
go 1.22.3
3+
go 1.22.12
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
77
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0
88
github.com/onsi/ginkgo/v2 v2.19.0
99
github.com/onsi/gomega v1.33.1
10-
helm.sh/helm/v3 v3.15.2
11-
k8s.io/api v0.30.2
12-
k8s.io/apimachinery v0.30.2
13-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
14-
sigs.k8s.io/controller-runtime v0.18.4
10+
helm.sh/helm/v3 v3.16.4
11+
k8s.io/api v0.31.11
12+
k8s.io/apimachinery v0.31.11
13+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
14+
sigs.k8s.io/controller-runtime v0.19.7
1515
)
1616

1717
require (
18+
dario.cat/mergo v1.0.1 // indirect
1819
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
1920
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
2021
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
@@ -23,38 +24,41 @@ require (
2324
github.com/BurntSushi/toml v1.3.2 // indirect
2425
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2526
github.com/Masterminds/goutils v1.1.1 // indirect
26-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
27-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
27+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
28+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
2829
github.com/Masterminds/squirrel v1.5.4 // indirect
29-
github.com/Microsoft/hcsshim v0.11.4 // indirect
30-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
30+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
32+
github.com/blang/semver/v4 v4.0.0 // indirect
33+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3334
github.com/chai2010/gettext-go v1.0.2 // indirect
34-
github.com/containerd/containerd v1.7.12 // indirect
35+
github.com/containerd/containerd v1.7.23 // indirect
36+
github.com/containerd/errdefs v0.3.0 // indirect
3537
github.com/containerd/log v0.1.0 // indirect
36-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
37-
github.com/davecgh/go-spew v1.1.1 // indirect
38-
github.com/distribution/reference v0.5.0 // indirect
38+
github.com/containerd/platforms v0.2.1 // indirect
39+
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
40+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
41+
github.com/distribution/reference v0.6.0 // indirect
3942
github.com/docker/cli v25.0.1+incompatible // indirect
4043
github.com/docker/distribution v2.8.3+incompatible // indirect
41-
github.com/docker/docker v25.0.5+incompatible // indirect
44+
github.com/docker/docker v25.0.6+incompatible // indirect
4245
github.com/docker/docker-credential-helpers v0.7.0 // indirect
4346
github.com/docker/go-connections v0.5.0 // indirect
4447
github.com/docker/go-metrics v0.0.1 // indirect
4548
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
46-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
49+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
4750
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4851
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4952
github.com/fatih/color v1.13.0 // indirect
50-
github.com/felixge/httpsnoop v1.0.3 // indirect
53+
github.com/felixge/httpsnoop v1.0.4 // indirect
54+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5155
github.com/go-errors/errors v1.4.2 // indirect
5256
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
53-
github.com/go-logr/logr v1.4.1 // indirect
57+
github.com/go-logr/logr v1.4.2 // indirect
5458
github.com/go-logr/stdr v1.2.2 // indirect
5559
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5660
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.3 // indirect
61+
github.com/go-openapi/swag v0.22.4 // indirect
5862
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5963
github.com/gobwas/glob v0.2.3 // indirect
6064
github.com/gogo/protobuf v1.3.2 // indirect
@@ -64,7 +68,7 @@ require (
6468
github.com/google/gnostic-models v0.6.8 // indirect
6569
github.com/google/go-cmp v0.6.0 // indirect
6670
github.com/google/gofuzz v1.2.0 // indirect
67-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
71+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
6872
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6973
github.com/google/uuid v1.6.0 // indirect
7074
github.com/gorilla/mux v1.8.0 // indirect
@@ -73,13 +77,13 @@ require (
7377
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
7478
github.com/hashicorp/errwrap v1.1.0 // indirect
7579
github.com/hashicorp/go-multierror v1.1.1 // indirect
76-
github.com/huandu/xstrings v1.4.0 // indirect
77-
github.com/imdario/mergo v0.3.13 // indirect
80+
github.com/huandu/xstrings v1.5.0 // indirect
81+
github.com/imdario/mergo v0.3.16 // indirect
7882
github.com/inconshreveable/mousetrap v1.1.0 // indirect
79-
github.com/jmoiron/sqlx v1.3.5 // indirect
83+
github.com/jmoiron/sqlx v1.4.0 // indirect
8084
github.com/josharian/intern v1.0.0 // indirect
8185
github.com/json-iterator/go v1.1.12 // indirect
82-
github.com/klauspost/compress v1.16.0 // indirect
86+
github.com/klauspost/compress v1.16.7 // indirect
8387
github.com/kylelemons/godebug v1.1.0 // indirect
8488
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
8589
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -89,71 +93,79 @@ require (
8993
github.com/mattn/go-colorable v0.1.13 // indirect
9094
github.com/mattn/go-isatty v0.0.17 // indirect
9195
github.com/mattn/go-runewidth v0.0.9 // indirect
92-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
9396
github.com/mitchellh/copystructure v1.2.0 // indirect
9497
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9598
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9699
github.com/moby/locker v1.0.1 // indirect
97-
github.com/moby/spdystream v0.2.0 // indirect
100+
github.com/moby/spdystream v0.4.0 // indirect
98101
github.com/moby/term v0.5.0 // indirect
99102
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
100103
github.com/modern-go/reflect2 v1.0.2 // indirect
101104
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
102105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103106
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
104107
github.com/opencontainers/go-digest v1.0.0 // indirect
105-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
108+
github.com/opencontainers/image-spec v1.1.0 // indirect
106109
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
107110
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
108111
github.com/pkg/errors v0.9.1 // indirect
109-
github.com/prometheus/client_golang v1.16.0 // indirect
110-
github.com/prometheus/client_model v0.4.0 // indirect
111-
github.com/prometheus/common v0.44.0 // indirect
112-
github.com/prometheus/procfs v0.12.0 // indirect
113-
github.com/rubenv/sql-migrate v1.5.2 // indirect
112+
github.com/prometheus/client_golang v1.19.1 // indirect
113+
github.com/prometheus/client_model v0.6.1 // indirect
114+
github.com/prometheus/common v0.55.0 // indirect
115+
github.com/prometheus/procfs v0.15.1 // indirect
116+
github.com/rubenv/sql-migrate v1.7.0 // indirect
114117
github.com/russross/blackfriday/v2 v2.1.0 // indirect
115-
github.com/shopspring/decimal v1.3.1 // indirect
118+
github.com/shopspring/decimal v1.4.0 // indirect
116119
github.com/sirupsen/logrus v1.9.3 // indirect
117-
github.com/spf13/cast v1.5.0 // indirect
118-
github.com/spf13/cobra v1.8.0 // indirect
120+
github.com/spf13/cast v1.7.0 // indirect
121+
github.com/spf13/cobra v1.8.1 // indirect
119122
github.com/spf13/pflag v1.0.5 // indirect
123+
github.com/x448/float16 v0.8.4 // indirect
120124
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
121125
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
122126
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
123127
github.com/xlab/treeprint v1.2.0 // indirect
124-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
125-
go.opentelemetry.io/otel v1.19.0 // indirect
126-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
127-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
128+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
129+
go.opentelemetry.io/otel v1.28.0 // indirect
130+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
131+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
128132
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
129-
golang.org/x/crypto v0.24.0 // indirect
133+
golang.org/x/crypto v0.31.0 // indirect
130134
golang.org/x/net v0.26.0 // indirect
131-
golang.org/x/oauth2 v0.12.0 // indirect
132-
golang.org/x/sync v0.7.0 // indirect
133-
golang.org/x/sys v0.21.0 // indirect
134-
golang.org/x/term v0.21.0 // indirect
135-
golang.org/x/text v0.16.0 // indirect
135+
golang.org/x/oauth2 v0.21.0 // indirect
136+
golang.org/x/sync v0.10.0 // indirect
137+
golang.org/x/sys v0.28.0 // indirect
138+
golang.org/x/term v0.27.0 // indirect
139+
golang.org/x/text v0.21.0 // indirect
136140
golang.org/x/time v0.3.0 // indirect
137141
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
138-
google.golang.org/appengine v1.6.7 // indirect
139-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
140-
google.golang.org/grpc v1.58.3 // indirect
141-
google.golang.org/protobuf v1.33.0 // indirect
142+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
143+
google.golang.org/grpc v1.65.0 // indirect
144+
google.golang.org/protobuf v1.34.2 // indirect
145+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
142146
gopkg.in/inf.v0 v0.9.1 // indirect
143147
gopkg.in/yaml.v2 v2.4.0 // indirect
144148
gopkg.in/yaml.v3 v3.0.1 // indirect
145-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
146-
k8s.io/apiserver v0.30.1 // indirect
147-
k8s.io/cli-runtime v0.30.2 // indirect
148-
k8s.io/client-go v0.30.2 // indirect
149-
k8s.io/component-base v0.30.1 // indirect
150-
k8s.io/klog/v2 v2.120.1 // indirect
149+
k8s.io/apiextensions-apiserver v0.31.3 // indirect
150+
k8s.io/apiserver v0.31.11 // indirect
151+
k8s.io/cli-runtime v0.31.11 // indirect
152+
k8s.io/client-go v0.31.11 // indirect
153+
k8s.io/component-base v0.31.11 // indirect
154+
k8s.io/klog/v2 v2.130.1 // indirect
151155
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
152-
k8s.io/kubectl v0.30.0 // indirect
156+
k8s.io/kubectl v0.31.3 // indirect
153157
oras.land/oras-go v1.2.5 // indirect
154158
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
155-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
156-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
159+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
160+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
157161
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
158162
sigs.k8s.io/yaml v1.4.0 // indirect
159163
)
164+
165+
replace k8s.io/api => k8s.io/api v0.31.11
166+
167+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.11
168+
169+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.11
170+
171+
replace k8s.io/kubectl => k8s.io/kubectl v0.31.11

0 commit comments

Comments
 (0)