Skip to content

Commit 83c9801

Browse files
authored
Update Go Version to 1.26.0
1 parent c09f13a commit 83c9801

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.6 AS builder
1+
FROM golang:1.26.0 AS builder
22
WORKDIR /workspace
33

44
COPY go.mod go.mod

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Set the Operator SDK version to use. By default, what is installed on the
22
# system is used. This is useful for CI or a project to utilize a specific
33
# version of the operator-sdk toolkit.
4-
OPERATOR_SDK_VERSION ?= v1.40.0
4+
OPERATOR_SDK_VERSION ?= v1.42.0
55

66
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
77
ifeq (,$(shell go env GOBIN))
@@ -100,12 +100,12 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
100100
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
101101

102102
## Tool Versions
103-
CONTROLLER_TOOLS_VERSION ?= v0.17.2
103+
CONTROLLER_TOOLS_VERSION ?= v0.20.1
104104
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
105105
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
106106
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
107107
ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
108-
GOLANGCI_LINT_VERSION ?= v2.0.2
108+
GOLANGCI_LINT_VERSION ?= v2.9.0
109109

110110
.PHONY: controller-gen
111111
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
@@ -128,7 +128,7 @@ $(ENVTEST): $(LOCALBIN)
128128
.PHONY: golangci-lint
129129
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
130130
$(GOLANGCI_LINT): $(LOCALBIN)
131-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
131+
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
132132

133133
# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
134134
# $1 - target path with name of binary

charts/slo-operator/crds/ricoberger.de_servicelevelobjectives.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.2
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
name: servicelevelobjectives.ricoberger.de
88
spec:
99
group: ricoberger.de

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ricoberger/slo-operator
22

3-
go 1.25.5
3+
go 1.26.0
44

55
require (
66
github.com/VictoriaMetrics/operator/api v0.66.1

0 commit comments

Comments
 (0)