Skip to content

Commit c4b7fc5

Browse files
rethilrethil
authored
chore: upgrade go modules & 3pp used for building (#186)
1 parent 541373e commit c4b7fc5

File tree

12 files changed

+436
-1255
lines changed

12 files changed

+436
-1255
lines changed

‎.github/workflows/lint-and-test.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- main
1010

1111
env:
12-
GO_VERSION: 1.23.8
12+
GO_VERSION: 1.24.6
1313

1414
jobs:
1515
detect-modules:
@@ -23,7 +23,7 @@ jobs:
2323
go-version: ${{ env.GO_VERSION }}
2424
- id: set-modules
2525
run: echo "modules=$(go list -m -json | jq -s '.' | jq -c '[.[].Dir]')" >> $GITHUB_OUTPUT
26-
26+
2727
golangci-lint:
2828
needs: detect-modules
2929
runs-on: ubuntu-latest
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
working-directory: ${{ matrix.modules }}
5050
args: -v --timeout 5m
51-
version: v1.63.4
51+
version: v1.64.8
5252
test:
5353
needs: detect-modules
5454
runs-on: ubuntu-latest

‎go.work‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.23.8
1+
go 1.24.6
22

33
use (
44
./operator

‎go.work.sum‎

Lines changed: 30 additions & 887 deletions
Large diffs are not rendered by default.

‎operator/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23 AS builder
2+
FROM golang:1.24.6 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎operator/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Image URL to use all building/pushing image targets
22
IMG ?= controller:latest
33
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
4-
ENVTEST_K8S_VERSION = 1.29.0
4+
ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
55

66
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
77
ifeq (,$(shell go env GOBIN))
@@ -148,10 +148,10 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest-$(ENVTEST_VERSION)
148148
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
149149

150150
## Tool Versions
151-
KUSTOMIZE_VERSION ?= v5.3.0
151+
KUSTOMIZE_VERSION ?= v5.7.1
152152
CONTROLLER_TOOLS_VERSION ?= v0.19.0
153-
ENVTEST_VERSION ?= release-0.17
154-
GOLANGCI_LINT_VERSION ?= v1.57.2
153+
ENVTEST_VERSION ?= release-0.22
154+
GOLANGCI_LINT_VERSION ?= v1.64.8
155155

156156
.PHONY: kustomize
157157
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

‎operator/go.mod‎

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,81 @@
11
module truefoundry/elasti/operator
22

3-
go 1.23.8
3+
go 1.24.0
4+
5+
toolchain go1.24.6
46

57
require (
6-
github.com/getsentry/sentry-go v0.31.1
7-
github.com/onsi/ginkgo/v2 v2.19.0
8-
github.com/onsi/gomega v1.33.1
8+
github.com/getsentry/sentry-go v0.35.3
9+
github.com/onsi/ginkgo/v2 v2.25.3
10+
github.com/onsi/gomega v1.38.2
11+
github.com/prometheus/client_golang v1.23.2
912
github.com/truefoundry/elasti/pkg v0.0.0
1013
go.uber.org/zap v1.27.0
11-
k8s.io/api v0.31.0
12-
k8s.io/apimachinery v0.31.0
13-
k8s.io/client-go v0.31.0
14-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
15-
sigs.k8s.io/controller-runtime v0.19.0
14+
k8s.io/api v0.34.1
15+
k8s.io/apimachinery v0.34.1
16+
k8s.io/client-go v0.34.1
17+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
18+
sigs.k8s.io/controller-runtime v0.22.1
1619
)
1720

1821
replace github.com/truefoundry/elasti/pkg v0.0.0 => ../pkg
1922

2023
require (
24+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2125
github.com/beorn7/perks v1.0.1 // indirect
2226
github.com/cespare/xxhash/v2 v2.3.0 // indirect
23-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
24-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
25-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
26-
github.com/fsnotify/fsnotify v1.7.0 // indirect
27-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28-
github.com/go-logr/logr v1.4.2 // indirect
27+
github.com/davecgh/go-spew v1.1.1 // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
29+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
30+
github.com/fsnotify/fsnotify v1.9.0 // indirect
31+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
32+
github.com/go-logr/logr v1.4.3 // indirect
2933
github.com/go-logr/zapr v1.3.0 // indirect
30-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
34+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3135
github.com/go-openapi/jsonreference v0.20.2 // indirect
32-
github.com/go-openapi/swag v0.22.4 // indirect
36+
github.com/go-openapi/swag v0.23.0 // indirect
3337
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3438
github.com/gogo/protobuf v1.3.2 // indirect
35-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
36-
github.com/golang/protobuf v1.5.4 // indirect
37-
github.com/google/gnostic-models v0.6.8 // indirect
38-
github.com/google/go-cmp v0.6.0 // indirect
39-
github.com/google/gofuzz v1.2.0 // indirect
40-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
39+
github.com/google/btree v1.1.3 // indirect
40+
github.com/google/gnostic-models v0.7.0 // indirect
41+
github.com/google/go-cmp v0.7.0 // indirect
42+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4143
github.com/google/uuid v1.6.0 // indirect
42-
github.com/imdario/mergo v0.3.16 // indirect
4344
github.com/josharian/intern v1.0.0 // indirect
4445
github.com/json-iterator/go v1.1.12 // indirect
4546
github.com/mailru/easyjson v0.7.7 // indirect
4647
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
47-
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4849
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4950
github.com/pkg/errors v0.9.1 // indirect
50-
github.com/prometheus/client_golang v1.19.1
51-
github.com/prometheus/client_model v0.6.1 // indirect
52-
github.com/prometheus/common v0.55.0 // indirect
53-
github.com/prometheus/procfs v0.15.1 // indirect
54-
github.com/spf13/pflag v1.0.5 // indirect
51+
github.com/pmezard/go-difflib v1.0.0 // indirect
52+
github.com/prometheus/client_model v0.6.2 // indirect
53+
github.com/prometheus/common v0.66.1 // indirect
54+
github.com/prometheus/procfs v0.16.1 // indirect
55+
github.com/spf13/pflag v1.0.6 // indirect
5556
github.com/x448/float16 v0.8.4 // indirect
57+
go.uber.org/automaxprocs v1.6.0 // indirect
5658
go.uber.org/multierr v1.11.0 // indirect
57-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
58-
golang.org/x/net v0.38.0 // indirect
59-
golang.org/x/oauth2 v0.27.0 // indirect
60-
golang.org/x/sys v0.31.0 // indirect
61-
golang.org/x/term v0.30.0 // indirect
62-
golang.org/x/text v0.23.0 // indirect
63-
golang.org/x/time v0.3.0 // indirect
64-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
59+
go.yaml.in/yaml/v2 v2.4.2 // indirect
60+
go.yaml.in/yaml/v3 v3.0.4 // indirect
61+
golang.org/x/net v0.44.0 // indirect
62+
golang.org/x/oauth2 v0.30.0 // indirect
63+
golang.org/x/sync v0.17.0 // indirect
64+
golang.org/x/sys v0.36.0 // indirect
65+
golang.org/x/term v0.35.0 // indirect
66+
golang.org/x/text v0.29.0 // indirect
67+
golang.org/x/time v0.9.0 // indirect
68+
golang.org/x/tools v0.36.0 // indirect
6569
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
66-
google.golang.org/protobuf v1.34.2 // indirect
70+
google.golang.org/protobuf v1.36.8 // indirect
71+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6772
gopkg.in/inf.v0 v0.9.1 // indirect
68-
gopkg.in/yaml.v2 v2.4.0 // indirect
6973
gopkg.in/yaml.v3 v3.0.1 // indirect
70-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
74+
k8s.io/apiextensions-apiserver v0.34.0 // indirect
7175
k8s.io/klog/v2 v2.130.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
73-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
75-
sigs.k8s.io/yaml v1.4.0 // 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
7681
)

0 commit comments

Comments
 (0)