Skip to content

Commit 8709d8f

Browse files
committed
Merge branch 'bugfix/pin-go-toolchain-1.22.12' into tmp/octopus/w/132.0/bugfix/pin-go-toolchain-1.22.12
2 parents 3818924 + eeba084 commit 8709d8f

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

operator/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ IMG ?= controller:latest
5555
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5656
ENVTEST_K8S_VERSION = 1.30.0
5757

58+
# Force Go toolchain version to prevent automatic selection issues
59+
# See: https://go.dev/doc/toolchain
60+
export GOTOOLCHAIN = go1.22.12
61+
5862
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
5963
ifeq (,$(shell go env GOBIN))
6064
GOBIN=$(shell go env GOPATH)/bin
@@ -211,7 +215,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
211215
## Tool Versions
212216
KUSTOMIZE_VERSION ?= v5.4.2
213217
CONTROLLER_TOOLS_VERSION ?= v0.15.0
214-
ENVTEST_VERSION ?= release-0.18
218+
ENVTEST_VERSION ?= release-0.19
215219
GOLANGCI_LINT_VERSION ?= v1.59.1
216220

217221
.PHONY: kustomize

operator/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/scality/metalk8s/operator
22

33
go 1.22.0
4+
toolchain go1.22.12
45

56
require (
67
github.com/go-logr/logr v1.4.1

storage-operator/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ IMG ?= controller:latest
5555
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5656
ENVTEST_K8S_VERSION = 1.30.0
5757

58+
# Force Go toolchain version to prevent automatic selection issues
59+
# See: https://go.dev/doc/toolchain
60+
export GOTOOLCHAIN = go1.22.12
61+
5862
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
5963
ifeq (,$(shell go env GOBIN))
6064
GOBIN=$(shell go env GOPATH)/bin
@@ -211,7 +215,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
211215
## Tool Versions
212216
KUSTOMIZE_VERSION ?= v5.4.2
213217
CONTROLLER_TOOLS_VERSION ?= v0.15.0
214-
ENVTEST_VERSION ?= release-0.18
218+
ENVTEST_VERSION ?= release-0.19
215219
GOLANGCI_LINT_VERSION ?= v1.59.1
216220

217221
.PHONY: kustomize

storage-operator/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/scality/metalk8s/storage-operator
22

33
go 1.22.0
4+
toolchain go1.22.12
45

56
require (
67
github.com/go-logr/logr v1.4.1

0 commit comments

Comments
 (0)