Golang and dependencies update

.github/workflows/e2e-test.yaml

@@ -25,7 +25,7 @@ jobs:
           file: Dockerfile.controller
           push: true
           build-args: |
-            GO_BUILDER_IMG=golang:1.21
+            GO_BUILDER_IMG=golang:1.22
           tags: |
             ghcr.io/grafana/k6-operator:${{ github.sha }}
 

.github/workflows/golangci-lint.yaml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: false
       - name: lint
         uses: golangci/golangci-lint-action@v3

.github/workflows/push.yaml

@@ -47,7 +47,7 @@ jobs:
           push: true
           file: Dockerfile.controller
           build-args: |
-            GO_BUILDER_IMG=golang:1.21
+            GO_BUILDER_IMG=golang:1.22
           platforms: linux/amd64,linux/arm64
           tags: ghcr.io/grafana/k6-operator:latest,ghcr.io/grafana/k6-operator:controller-${{env.IMAGETAG}}
       - name: "Build:dockerimage"

.github/workflows/unit-test.yaml

@@ -7,8 +7,8 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x]
-        k8s_version: [1.19.2, 1.24.1, 1.27.1]
+        go-version: [1.22.x]
+        k8s_version: [1.24.1, 1.27.1, 1.30.0]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Test
         run: |
-          make test-setup-ci
+          make test-setup
           make test
         env:
           ENVTEST_K8S_VERSION: ${{ matrix.k8s_version }}

Makefile

@@ -11,8 +11,11 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
+CONTROLLER_GEN_VERSION=v0.16.1
+CONTROLLER_GEN=$(GOBIN)/controller-gen
+
 # Image to use for building Go
-GO_BUILDER_IMG ?= "golang:1.21"
+GO_BUILDER_IMG ?= "golang:1.22"
 # Image URL to use all building/pushing image targets
 IMG_NAME ?= ghcr.io/grafana/k6-operator
 IMG_TAG ?= latest
@@ -30,9 +33,9 @@ endif
 all: manager
 
 # Run tests
-ENVTEST_VERSION ?= release-0.17
+ENVTEST_VERSION ?= latest # ref. https://github.com/kubernetes-sigs/controller-runtime/tree/main/tools/setup-envtest
 ENVTEST_ASSETS_DIR = $(shell pwd)/testbin
-ENVTEST_K8S_VERSION ?= 1.24.1
+ENVTEST_K8S_VERSION ?= 1.30.0
 GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
 KUBEBUILDER_ASSETS_ROOT=/tmp
@@ -47,12 +50,6 @@ test-setup:
 	mv kubebuilder $(KUBEBUILDER_ASSETS_ROOT)
 	export KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS); go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)
 
-test-setup-ci:
-	curl -L -O "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-$(ENVTEST_K8S_VERSION)-$(GOOS)-$(GOARCH).tar.gz"
-	tar -xvf kubebuilder-tools-$(ENVTEST_K8S_VERSION)-$(GOOS)-$(GOARCH).tar.gz
-	mv kubebuilder $(KUBEBUILDER_ASSETS_ROOT)
-	export KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS); go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)
-
 e2e: deploy
 	kubectl create configmap crocodile-stress-test --from-file e2e/test.js
 	kubectl apply -f e2e/test.yaml
@@ -117,15 +114,12 @@ docker-push:
 # find or download controller-gen
 # download controller-gen if necessary
 controller-gen:
-ifeq (, $(shell which controller-gen))
 	@{ \
-	set -e ;\
-	go install sigs.k8s.io/controller-tools/cmd/[email protected] ;\
+	if ! which $(CONTROLLER_GEN) || [ 'Version $(CONTROLLER_GEN_VERSION)' != "$$($(CONTROLLER_GEN) --version)" ]; then\
+		set -e ;\
+		go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION) ;\
+	fi;\
 	}
-CONTROLLER_GEN=$(GOBIN)/controller-gen
-else
-CONTROLLER_GEN=$(shell which controller-gen)
-endif
 
 kustomize:
 ifeq (, $(shell which kustomize))