Skip to content

Commit 96ccb39

Browse files
committed
Bump to Kubernetes 1.34
Staying with 1.34 for now to avoid requiring go1.25 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent b8ab5b8 commit 96ccb39

File tree

4 files changed

+88
-81
lines changed

4 files changed

+88
-81
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25-alpine3.22 AS builder
1+
FROM golang:1.25-alpine3.23 AS builder
22

33
RUN apk add --no-cache bash git gcc musl-dev
44

@@ -18,15 +18,15 @@ FROM scratch AS binary
1818
COPY --from=builder /src/bin/helm-controller /bin/
1919

2020
# Dev stage for package, testing, and validation
21-
FROM golang:1.25-alpine3.22 AS dev
21+
FROM golang:1.25-alpine3.23 AS dev
2222
ARG ARCH
2323
ENV ARCH=$ARCH
2424
RUN apk add --no-cache bash git curl
2525
RUN if [ "${ARCH}" != "arm" ]; then \
26-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.7; \
26+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- v2.7.2; \
2727
fi
2828
RUN if [ "${ARCH}" = "amd64" ]; then \
29-
go install sigs.k8s.io/kustomize/kustomize/v5@v5.6.0; \
29+
go install sigs.k8s.io/kustomize/kustomize/v5@v5.8.1; \
3030
fi
3131

3232
WORKDIR /src

go.mod

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/k3s-io/helm-controller
22

3-
go 1.23.4
3+
go 1.24.12
44

55
require (
66
github.com/onsi/ginkgo/v2 v2.22.2
@@ -10,40 +10,39 @@ require (
1010
github.com/sirupsen/logrus v1.9.3
1111
github.com/stretchr/testify v1.10.0
1212
github.com/urfave/cli/v2 v2.27.5
13-
k8s.io/api v0.32.1
13+
k8s.io/api v0.34.4
1414
k8s.io/apiextensions-apiserver v0.32.1
15-
k8s.io/apimachinery v0.32.1
16-
k8s.io/client-go v0.32.1
15+
k8s.io/apimachinery v0.34.4
16+
k8s.io/client-go v0.34.4
1717
k8s.io/klog/v2 v2.130.1
18-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
18+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
1919
)
2020

2121
require (
22+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2223
github.com/beorn7/perks v1.0.1 // indirect
2324
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2425
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
2526
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
27+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2728
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
28-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
29+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2930
github.com/ghodss/yaml v1.0.0 // indirect
3031
github.com/go-logr/logr v1.4.2 // indirect
3132
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3233
github.com/go-openapi/jsonreference v0.21.0 // indirect
3334
github.com/go-openapi/swag v0.23.0 // indirect
3435
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3536
github.com/gogo/protobuf v1.3.2 // indirect
36-
github.com/golang/protobuf v1.5.4 // indirect
37-
github.com/google/gnostic-models v0.6.9 // indirect
38-
github.com/google/go-cmp v0.6.0 // indirect
39-
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/gnostic-models v0.7.0 // indirect
38+
github.com/google/go-cmp v0.7.0 // indirect
4039
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4140
github.com/google/uuid v1.6.0 // indirect
4241
github.com/josharian/intern v1.0.0 // indirect
4342
github.com/json-iterator/go v1.1.12 // indirect
4443
github.com/mailru/easyjson v0.7.7 // indirect
4544
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
46-
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4746
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4847
github.com/pkg/errors v0.9.1 // indirect
4948
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -52,28 +51,31 @@ require (
5251
github.com/prometheus/common v0.55.0 // indirect
5352
github.com/prometheus/procfs v0.15.1 // indirect
5453
github.com/russross/blackfriday/v2 v2.1.0 // indirect
55-
github.com/spf13/pflag v1.0.5 // indirect
54+
github.com/spf13/pflag v1.0.6 // indirect
5655
github.com/x448/float16 v0.8.4 // indirect
5756
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
57+
go.yaml.in/yaml/v2 v2.4.2 // indirect
58+
go.yaml.in/yaml/v3 v3.0.4 // indirect
5859
golang.org/x/mod v0.23.0 // indirect
59-
golang.org/x/net v0.35.0 // indirect
60+
golang.org/x/net v0.38.0 // indirect
6061
golang.org/x/oauth2 v0.27.0 // indirect
61-
golang.org/x/sync v0.11.0 // indirect
62-
golang.org/x/sys v0.30.0 // indirect
63-
golang.org/x/term v0.29.0 // indirect
64-
golang.org/x/text v0.22.0 // indirect
65-
golang.org/x/time v0.7.0 // indirect
62+
golang.org/x/sync v0.12.0 // indirect
63+
golang.org/x/sys v0.31.0 // indirect
64+
golang.org/x/term v0.30.0 // indirect
65+
golang.org/x/text v0.23.0 // indirect
66+
golang.org/x/time v0.9.0 // indirect
6667
golang.org/x/tools v0.30.0 // indirect
67-
google.golang.org/protobuf v1.36.1 // indirect
68+
google.golang.org/protobuf v1.36.5 // indirect
6869
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6970
gopkg.in/inf.v0 v0.9.1 // indirect
7071
gopkg.in/yaml.v2 v2.4.0 // indirect
7172
gopkg.in/yaml.v3 v3.0.1 // indirect
7273
k8s.io/code-generator v0.32.1 // indirect
7374
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 // indirect
74-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
75-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
76-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
77-
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
78-
sigs.k8s.io/yaml v1.4.0 // indirect
75+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
76+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
77+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
78+
sigs.k8s.io/randfill v1.0.0 // indirect
79+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
80+
sigs.k8s.io/yaml v1.6.0 // indirect
7981
)

0 commit comments

Comments
 (0)