Skip to content

Commit 88722e4

Browse files
authored
Merge pull request #479 from zalando-incubator/update-deps-2025-06-04
chore(deps): update k8s.io/* to v0.32.5
2 parents ac84610 + 2ed6a4e commit 88722e4

30 files changed

+476
-727
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- uses: actions/checkout@v4
88
- uses: actions/setup-go@v5
99
with:
10-
go-version: '^1.23'
10+
go-version: '^1.24'
1111
- run: go version
1212
- run: go install github.com/mattn/goveralls@latest
1313
- run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest

docs/zalando.org_elasticsearchdatasets.yaml

Lines changed: 232 additions & 298 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,42 @@ module github.com/zalando-incubator/es-operator
33
require (
44
github.com/alecthomas/kingpin/v2 v2.4.0
55
github.com/cenk/backoff v2.2.1+incompatible
6-
github.com/go-resty/resty/v2 v2.15.3
7-
github.com/jarcoal/httpmock v1.3.1
8-
github.com/prometheus/client_golang v1.20.4
6+
github.com/go-resty/resty/v2 v2.16.5
7+
github.com/jarcoal/httpmock v1.4.0
8+
github.com/prometheus/client_golang v1.22.0
99
github.com/sirupsen/logrus v1.9.3
10-
github.com/stretchr/testify v1.9.0
11-
k8s.io/api v0.31.1
12-
k8s.io/apimachinery v0.31.1
13-
k8s.io/client-go v0.31.1
14-
k8s.io/code-generator v0.31.1
15-
k8s.io/metrics v0.31.1
10+
github.com/stretchr/testify v1.10.0
11+
k8s.io/api v0.32.5
12+
k8s.io/apimachinery v0.32.5
13+
k8s.io/client-go v0.32.5
14+
k8s.io/code-generator v0.32.5
15+
k8s.io/metrics v0.32.5
1616
sigs.k8s.io/controller-tools v0.16.1
1717
sigs.k8s.io/yaml v1.4.0
1818
)
1919

2020
require (
21-
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
21+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2626
github.com/fatih/color v1.17.0 // indirect
2727
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2828
github.com/go-logr/logr v1.4.2 // indirect
29-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
29+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3030
github.com/go-openapi/jsonreference v0.20.2 // indirect
31-
github.com/go-openapi/swag v0.22.4 // indirect
31+
github.com/go-openapi/swag v0.23.0 // indirect
3232
github.com/gobuffalo/flect v1.0.2 // indirect
3333
github.com/gogo/protobuf v1.3.2 // indirect
34-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3534
github.com/golang/protobuf v1.5.4 // indirect
3635
github.com/google/gnostic-models v0.6.8 // indirect
37-
github.com/google/go-cmp v0.6.0 // indirect
36+
github.com/google/go-cmp v0.7.0 // indirect
3837
github.com/google/gofuzz v1.2.0 // indirect
3938
github.com/google/uuid v1.6.0 // indirect
40-
github.com/imdario/mergo v0.3.7 // indirect
4139
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4240
github.com/josharian/intern v1.0.0 // indirect
4341
github.com/json-iterator/go v1.1.12 // indirect
44-
github.com/klauspost/compress v1.17.9 // indirect
4542
github.com/mailru/easyjson v0.7.7 // indirect
4643
github.com/mattn/go-colorable v0.1.13 // indirect
4744
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -51,37 +48,35 @@ require (
5148
github.com/pkg/errors v0.9.1 // indirect
5249
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5350
github.com/prometheus/client_model v0.6.1 // indirect
54-
github.com/prometheus/common v0.55.0 // indirect
51+
github.com/prometheus/common v0.62.0 // indirect
5552
github.com/prometheus/procfs v0.15.1 // indirect
5653
github.com/spf13/cobra v1.8.1 // indirect
5754
github.com/spf13/pflag v1.0.5 // indirect
5855
github.com/x448/float16 v0.8.4 // indirect
5956
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
60-
golang.org/x/mod v0.20.0 // indirect
61-
golang.org/x/net v0.29.0 // indirect
62-
golang.org/x/oauth2 v0.21.0 // indirect
63-
golang.org/x/sync v0.8.0 // indirect
64-
golang.org/x/sys v0.25.0 // indirect
65-
golang.org/x/term v0.24.0 // indirect
66-
golang.org/x/text v0.18.0 // indirect
67-
golang.org/x/time v0.6.0 // indirect
68-
golang.org/x/tools v0.24.0 // indirect
69-
google.golang.org/protobuf v1.34.2 // indirect
57+
golang.org/x/mod v0.21.0 // indirect
58+
golang.org/x/net v0.40.0 // indirect
59+
golang.org/x/oauth2 v0.24.0 // indirect
60+
golang.org/x/sync v0.14.0 // indirect
61+
golang.org/x/sys v0.33.0 // indirect
62+
golang.org/x/term v0.32.0 // indirect
63+
golang.org/x/text v0.25.0 // indirect
64+
golang.org/x/time v0.7.0 // indirect
65+
golang.org/x/tools v0.26.0 // indirect
66+
google.golang.org/protobuf v1.36.5 // indirect
7067
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7168
gopkg.in/inf.v0 v0.9.1 // indirect
7269
gopkg.in/yaml.v2 v2.4.0 // indirect
7370
gopkg.in/yaml.v3 v3.0.1 // indirect
7471
k8s.io/apiextensions-apiserver v0.31.0 // indirect
75-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
72+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
7673
k8s.io/klog/v2 v2.130.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
78-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
79-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
80-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
74+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
75+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
76+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
77+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
8178
)
8279

8380
replace k8s.io/klog => github.com/mikkeloscar/knolog v0.0.0-20190326191552-80742771eb6b
8481

85-
go 1.23
86-
87-
toolchain go1.23.1
82+
go 1.24

0 commit comments

Comments
 (0)