chore: bump version to 1.23 and golangci-lint to 1.61

.github/workflows/go.yml

@@ -32,9 +32,9 @@ jobs:
         run: git config --global core.autocrlf false
       - name: Lint
         if: matrix.os == 'ubuntu-latest'
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.56.2
+          version: v1.61.0
           args: --timeout 10m
           skip-cache: false
       - name: Vet

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22 AS build
+FROM golang:1.23 AS build
 
 WORKDIR /src
 # enable modules caching in separate layer
@@ -8,7 +8,7 @@ COPY . ./
 
 RUN make binary
 
-FROM debian:12.5-slim
+FROM debian:12.7-slim
 
 ENV DEBIAN_FRONTEND noninteractive
 

Makefile

@@ -1,6 +1,6 @@
 GO ?= go
 GOLANGCI_LINT ?= golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.51.2
+GOLANGCI_LINT_VERSION ?= v1.61.0
 
 COMMIT ?= "$(shell git describe --long --dirty --always --match "" || true)"
 LDFLAGS ?= -s -w -X github.com/ethersphere/beekeeper.commit=$(COMMIT)

go.mod

@@ -1,19 +1,15 @@
 module github.com/ethersphere/beekeeper
 
-go 1.23.0
-
-toolchain go1.23.2
+go 1.23
 
 replace github.com/codahale/hdrhistogram => github.com/HdrHistogram/hdrhistogram-go v1.1.2
 
-replace github.com/ethersphere/node-funder => C:/Git/node-funder
-
 require (
 	github.com/ethereum/go-ethereum v1.14.3
 	github.com/ethersphere/bee/v2 v2.2.0
 	github.com/ethersphere/bmt v0.1.4
 	github.com/ethersphere/ethproxy v0.0.5
-	github.com/ethersphere/node-funder v0.2.0
+	github.com/ethersphere/node-funder v0.2.1
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.11.0
 	github.com/google/uuid v1.6.0

go.sum

@@ -88,6 +88,8 @@ github.com/ethersphere/ethproxy v0.0.5 h1:j5Mkm45jqmkET6NwGaJtaxOSFbhoAfOKzHiwHl
 github.com/ethersphere/ethproxy v0.0.5/go.mod h1:7mkVRK3+Mte00jLxFAbUQ/cBepAzwTYpkE64ItCLZYw=
 github.com/ethersphere/go-sw3-abi v0.6.5 h1:M5dcIe1zQYvGpY2K07UNkNU9Obc4U+A1fz68Ho/Q+XE=
 github.com/ethersphere/go-sw3-abi v0.6.5/go.mod h1:BmpsvJ8idQZdYEtWnvxA8POYQ8Rl/NhyCdF0zLMOOJU=
+github.com/ethersphere/node-funder v0.2.1 h1:dspKQorhm2Vs5XE/r4CDTsEwqbtt+Y/thvLBJGafTok=
+github.com/ethersphere/node-funder v0.2.1/go.mod h1:CLAKVihL5ijWoCCskpgOl7cz9W4HTqIWNu055LNA+/A=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=

pkg/orchestration/k8s/node_orchestrator.go

@@ -286,8 +286,9 @@ func (n *nodeOrchestrator) Create(ctx context.Context, o orchestration.CreateOpt
 					PodSecurityContext: pod.PodSecurityContext{
 						FSGroup: 999,
 					},
-					RestartPolicy:      o.RestartPolicy,
-					ServiceAccountName: svcAccount,
+					RestartPolicy:                 o.RestartPolicy,
+					ServiceAccountName:            svcAccount,
+					TerminationGracePeriodSeconds: 60,
 					Volumes: setVolumes(setVolumesOptions{
 						ConfigCM:           configCM,
 						KeysSecret:         keysSecret,