Skip to content

Commit e516aa8

Browse files
stefanprodanstefanprodan
authored
Merge pull request #438 from stefanprodan/k8s-1.31
Update dependencies to Kubernetes v1.31
2 parents 18698a8 + 1c8e889 commit e516aa8

File tree

8 files changed

+254
-243
lines changed

8 files changed

+254
-243
lines changed

Diff for: ‎.github/workflows/build.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ jobs:
1818
- name: Setup Go
1919
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2020
with:
21-
go-version-file: 'go.mod'
22-
cache: true
21+
go-version: 1.23.x
2322
- name: Setup CUE
2423
uses: cue-lang/setup-cue@a93fa358375740cd8b0078f76355512b9208acb1 # main
2524
with:
26-
version: v0.8.1
25+
version: v0.9.2
2726
- name: Run tests
2827
run: make test
2928
- name: Run linter

Diff for: ‎.github/workflows/docs.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2222
with:
23-
go-version-file: 'go.mod'
24-
cache: true
23+
go-version: 1.23.x
2524
- name: Generate cmd docs
2625
run: make prep-docs
2726
- name: Run mkdocs

Diff for: ‎.github/workflows/e2e.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
- name: Setup Go
2525
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2626
with:
27-
go-version-file: 'go.mod'
28-
cache: true
27+
go-version: 1.23.x
2928
- name: Setup Kubernetes
3029
uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0
3130
with:

Diff for: ‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Go
2626
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2727
with:
28-
go-version: 1.22.x
28+
go-version: 1.23.x
2929
cache: false
3030
- name: Setup Syft
3131
uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4

Diff for: ‎.github/workflows/scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Go
2424
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2525
with:
26-
go-version: 1.22.x
26+
go-version: 1.23.x
2727
cache-dependency-path: |
2828
**/go.sum
2929
**/go.mod

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test: tidy generate fmt vet install-envtest ## Run the Go tests.
2525
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test ./... -coverprofile cover.out
2626

2727
tidy: ## Tidy Go modules.
28-
rm -f go.sum; go mod tidy -compat=1.22
28+
rm -f go.sum; go mod tidy -compat=1.23
2929

3030
fmt: ## Format Go code.
3131
go fmt ./...

Diff for: ‎go.mod

+81-75
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,81 @@
11
module github.com/stefanprodan/timoni
22

3-
go 1.22.0
3+
go 1.23
44

55
require (
66
cuelang.org/go v0.9.2
7-
github.com/Masterminds/semver/v3 v3.2.1
7+
github.com/Masterminds/semver/v3 v3.3.0
88
github.com/briandowns/spinner v1.23.1
9-
github.com/distribution/distribution/v3 v3.0.0-alpha.1
10-
github.com/fatih/color v1.17.0
11-
github.com/fluxcd/cli-utils v0.36.0-flux.7
12-
github.com/fluxcd/pkg/sourceignore v0.7.0
13-
github.com/fluxcd/pkg/ssa v0.39.1
14-
github.com/fluxcd/pkg/tar v0.7.0
15-
github.com/getkin/kin-openapi v0.125.0
9+
github.com/distribution/distribution/v3 v3.0.0-beta.1
10+
github.com/fatih/color v1.18.0
11+
github.com/fluxcd/cli-utils v0.36.0-flux.9
12+
github.com/fluxcd/pkg/sourceignore v0.8.1
13+
github.com/fluxcd/pkg/ssa v0.41.1
14+
github.com/fluxcd/pkg/tar v0.8.1
15+
github.com/getkin/kin-openapi v0.128.0
1616
github.com/go-logr/logr v1.4.2
1717
github.com/go-logr/zerologr v1.2.3
1818
github.com/gonvenience/ytbx v1.4.4
1919
github.com/google/go-cmp v0.6.0
20-
github.com/google/go-containerregistry v0.19.2
20+
github.com/google/go-containerregistry v0.20.2
2121
github.com/hashicorp/go-cleanhttp v0.5.2
22-
github.com/homeport/dyff v1.8.0
22+
github.com/homeport/dyff v1.9.2
2323
github.com/mattn/go-shellwords v1.0.12
2424
github.com/olekukonko/tablewriter v0.0.5
25-
github.com/onsi/gomega v1.33.1
25+
github.com/onsi/gomega v1.34.2
2626
github.com/otiai10/copy v1.14.0
2727
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
2828
github.com/rs/zerolog v1.33.0
2929
github.com/sirupsen/logrus v1.9.3
3030
github.com/spf13/cobra v1.8.1
31-
k8s.io/api v0.30.2
32-
k8s.io/apiextensions-apiserver v0.30.2
33-
k8s.io/apimachinery v0.30.2
34-
k8s.io/cli-runtime v0.30.2
35-
k8s.io/client-go v0.30.2
36-
sigs.k8s.io/controller-runtime v0.18.4
31+
k8s.io/api v0.31.1
32+
k8s.io/apiextensions-apiserver v0.31.1
33+
k8s.io/apimachinery v0.31.1
34+
k8s.io/cli-runtime v0.31.1
35+
k8s.io/client-go v0.31.1
36+
sigs.k8s.io/controller-runtime v0.19.0
3737
sigs.k8s.io/yaml v1.4.0
3838
)
3939

4040
require (
4141
cuelabs.dev/go/oci/ociregistry v0.0.0-20240404174027-a39bec0462d2 // indirect
4242
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
43-
github.com/BurntSushi/toml v1.3.2 // indirect
43+
github.com/BurntSushi/toml v1.4.0 // indirect
4444
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4545
github.com/beorn7/perks v1.0.1 // indirect
4646
github.com/blang/semver/v4 v4.0.0 // indirect
4747
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
48-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
49-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
48+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
49+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5050
github.com/chai2010/gettext-go v1.0.2 // indirect
5151
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
5252
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
5353
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5454
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
55-
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
55+
github.com/cyphar/filepath-securejoin v0.3.2 // indirect
5656
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5757
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
58-
github.com/distribution/reference v0.5.0 // indirect
59-
github.com/docker/cli v24.0.9+incompatible // indirect
58+
github.com/distribution/reference v0.6.0 // indirect
59+
github.com/docker/cli v27.3.1+incompatible // indirect
6060
github.com/docker/distribution v2.8.3+incompatible // indirect
61-
github.com/docker/docker v26.1.4+incompatible // indirect
6261
github.com/docker/docker-credential-helpers v0.8.0 // indirect
6362
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
6463
github.com/docker/go-metrics v0.0.1 // indirect
6564
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
6665
github.com/emicklei/proto v1.10.0 // indirect
67-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6866
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6967
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
7068
github.com/felixge/httpsnoop v1.0.4 // indirect
7169
github.com/fsnotify/fsnotify v1.7.0 // indirect
70+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7271
github.com/go-errors/errors v1.5.1 // indirect
7372
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
7473
github.com/go-git/go-billy/v5 v5.5.0 // indirect
75-
github.com/go-git/go-git/v5 v5.11.0 // indirect
74+
github.com/go-git/go-git/v5 v5.12.0 // indirect
7675
github.com/go-logr/stdr v1.2.2 // indirect
77-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
76+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
7877
github.com/go-openapi/jsonreference v0.20.2 // indirect
79-
github.com/go-openapi/swag v0.22.8 // indirect
78+
github.com/go-openapi/swag v0.23.0 // indirect
8079
github.com/gogo/protobuf v1.3.2 // indirect
8180
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8281
github.com/golang/protobuf v1.5.4 // indirect
@@ -90,20 +89,20 @@ require (
9089
github.com/google/gofuzz v1.2.0 // indirect
9190
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9291
github.com/google/uuid v1.6.0 // indirect
93-
github.com/gorilla/handlers v1.5.1 // indirect
92+
github.com/gorilla/handlers v1.5.2 // indirect
9493
github.com/gorilla/mux v1.8.1 // indirect
9594
github.com/gorilla/websocket v1.5.0 // indirect
9695
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
97-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
96+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
9897
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
9998
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
10099
github.com/imdario/mergo v0.3.15 // indirect
101100
github.com/inconshreveable/mousetrap v1.1.0 // indirect
102-
github.com/invopop/yaml v0.2.0 // indirect
101+
github.com/invopop/yaml v0.3.1 // indirect
103102
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
104103
github.com/josharian/intern v1.0.0 // indirect
105104
github.com/json-iterator/go v1.1.12 // indirect
106-
github.com/klauspost/compress v1.17.4 // indirect
105+
github.com/klauspost/compress v1.17.11 // indirect
107106
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
108107
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
109108
github.com/mailru/easyjson v0.7.7 // indirect
@@ -115,7 +114,7 @@ require (
115114
github.com/mitchellh/go-ps v1.0.0 // indirect
116115
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
117116
github.com/mitchellh/hashstructure v1.1.0 // indirect
118-
github.com/moby/spdystream v0.2.0 // indirect
117+
github.com/moby/spdystream v0.4.0 // indirect
119118
github.com/moby/term v0.5.0 // indirect
120119
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
121120
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -128,67 +127,74 @@ require (
128127
github.com/perimeterx/marshmallow v1.1.5 // indirect
129128
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
130129
github.com/pkg/errors v0.9.1 // indirect
131-
github.com/prometheus/client_golang v1.18.0 // indirect
132-
github.com/prometheus/client_model v0.5.0 // indirect
133-
github.com/prometheus/common v0.48.0 // indirect
134-
github.com/prometheus/procfs v0.12.0 // indirect
130+
github.com/prometheus/client_golang v1.20.4 // indirect
131+
github.com/prometheus/client_model v0.6.1 // indirect
132+
github.com/prometheus/common v0.60.0 // indirect
133+
github.com/prometheus/procfs v0.15.1 // indirect
135134
github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 // indirect
136135
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
137136
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
138137
github.com/redis/go-redis/v9 v9.1.0 // indirect
139138
github.com/rivo/uniseg v0.2.0 // indirect
140-
github.com/rogpeppe/go-internal v1.12.0 // indirect
139+
github.com/rogpeppe/go-internal v1.13.1 // indirect
141140
github.com/russross/blackfriday/v2 v2.1.0 // indirect
142141
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
143142
github.com/spf13/pflag v1.0.5 // indirect
144143
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
145144
github.com/vbatts/tar-split v0.11.3 // indirect
146145
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
146+
github.com/x448/float16 v0.8.4 // indirect
147147
github.com/xlab/treeprint v1.2.0 // indirect
148-
go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 // indirect
149-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
150-
go.opentelemetry.io/otel v1.21.0 // indirect
151-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
152-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
153-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
154-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
155-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
156-
go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
157-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
158-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
159-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
160-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
161-
go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
162-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
163-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
148+
go.opentelemetry.io/contrib/bridges/prometheus v0.56.0 // indirect
149+
go.opentelemetry.io/contrib/exporters/autoexport v0.56.0 // indirect
150+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
151+
go.opentelemetry.io/otel v1.31.0 // indirect
152+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.7.0 // indirect
153+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 // indirect
154+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
155+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 // indirect
156+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
157+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
158+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
159+
go.opentelemetry.io/otel/exporters/prometheus v0.53.0 // indirect
160+
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect
161+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.31.0 // indirect
162+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 // indirect
163+
go.opentelemetry.io/otel/log v0.7.0 // indirect
164+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
165+
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
166+
go.opentelemetry.io/otel/sdk/log v0.7.0 // indirect
167+
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
168+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
169+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
164170
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
165-
golang.org/x/crypto v0.24.0 // indirect
166-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
167-
golang.org/x/mod v0.18.0 // indirect
168-
golang.org/x/net v0.26.0 // indirect
169-
golang.org/x/oauth2 v0.21.0 // indirect
170-
golang.org/x/sync v0.7.0 // indirect
171-
golang.org/x/sys v0.21.0 // indirect
172-
golang.org/x/term v0.21.0 // indirect
173-
golang.org/x/text v0.16.0 // indirect
174-
golang.org/x/time v0.5.0 // indirect
171+
golang.org/x/crypto v0.28.0 // indirect
172+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
173+
golang.org/x/mod v0.21.0 // indirect
174+
golang.org/x/net v0.30.0 // indirect
175+
golang.org/x/oauth2 v0.23.0 // indirect
176+
golang.org/x/sync v0.8.0 // indirect
177+
golang.org/x/sys v0.26.0 // indirect
178+
golang.org/x/term v0.25.0 // indirect
179+
golang.org/x/text v0.19.0 // indirect
180+
golang.org/x/time v0.6.0 // indirect
175181
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
176-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
177-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
178-
google.golang.org/grpc v1.59.0 // indirect
179-
google.golang.org/protobuf v1.33.0 // indirect
182+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
183+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
184+
google.golang.org/grpc v1.67.1 // indirect
185+
google.golang.org/protobuf v1.35.1 // indirect
180186
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
181187
gopkg.in/inf.v0 v0.9.1 // indirect
182188
gopkg.in/warnings.v0 v0.1.2 // indirect
183189
gopkg.in/yaml.v2 v2.4.0 // indirect
184190
gopkg.in/yaml.v3 v3.0.1 // indirect
185-
k8s.io/component-base v0.30.2 // indirect
186-
k8s.io/klog/v2 v2.120.1 // indirect
191+
k8s.io/component-base v0.31.1 // indirect
192+
k8s.io/klog/v2 v2.130.1 // indirect
187193
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
188-
k8s.io/kubectl v0.30.2 // indirect
189-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
194+
k8s.io/kubectl v0.31.1 // indirect
195+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
190196
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
191-
sigs.k8s.io/kustomize/api v0.17.1 // indirect
192-
sigs.k8s.io/kustomize/kyaml v0.17.0 // indirect
197+
sigs.k8s.io/kustomize/api v0.17.3 // indirect
198+
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
193199
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
194200
)

0 commit comments

Comments
 (0)