File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11build_root_image :
22 name : tools
33 namespace : openstack-k8s-operators
4- tag : ci-build-root-golang-1.21 -sdk-1.31
4+ tag : ci-build-root-golang-1.24 -sdk-1.31
Original file line number Diff line number Diff line change 1515 uses : openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main
1616 with :
1717 operator_name : swift
18- go_version : 1.21 .x
18+ go_version : 1.24 .x
1919 operator_sdk_version : 1.31.0
2020 secrets :
2121 IMAGENAMESPACE : ${{ secrets.IMAGENAMESPACE }}
Original file line number Diff line number Diff line change 99 with :
1010 operator_name : swift
1111 branch_name : ${{ github.ref_name }}
12+ custom_image : quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.31
1213 secrets :
1314 FORCE_BUMP_PULL_REQUEST_PAT : ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}
Original file line number Diff line number Diff line change 1010 uses : openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-branches.yaml@main
1111 with :
1212 operator_name : swift
13+ custom_image : quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.31
1314 secrets :
1415 FORCE_BUMP_PULL_REQUEST_PAT : ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}
Original file line number Diff line number Diff line change 1+ version : 2
2+
13linters :
24 # Enable specific linter
35 # https://golangci-lint.run/usage/linters/#enabled-by-default
46 enable :
57 - errorlint
68 - revive
79 - ginkgolinter
8- - gofmt
910 - govet
11+ - gosec
12+ - errname
13+ - err113
14+
15+ formatters :
16+ enable :
17+ - gofmt
18+
1019run :
1120 timeout : 5m
Original file line number Diff line number Diff line change 4242 - id : go-mod-tidy
4343
4444- repo : https://github.com/golangci/golangci-lint
45- rev : v1.59.1
45+ rev : v2.4.0
4646 hooks :
4747 - id : golangci-lint-full
4848 args : ["-v"]
Original file line number Diff line number Diff line change 1- ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21
1+ ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24
22ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
33
44# Build the manager binary
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ IMG ?= $(DEFAULT_IMG)
5757ENVTEST_K8S_VERSION = 1.29.0
5858
5959# Set minimum Go version
60- GOTOOLCHAIN_VERSION ?= go1.21 .0
60+ GOTOOLCHAIN_VERSION ?= go1.24 .0
6161
6262GINKGO ?= $(LOCALBIN ) /ginkgo
6363
@@ -121,9 +121,10 @@ tidy: ## Run go mod tidy on every mod file in the repo
121121 go mod tidy
122122 cd ./api && go mod tidy
123123
124+ GOLANGCI_LINT_VERSION ?= v2.4.0
124125.PHONY : golangci-lint
125126golangci-lint :
126- test -s $(LOCALBIN ) /golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.1
127+ test -s $(LOCALBIN ) /golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $( GOLANGCI_LINT_VERSION )
127128 $(LOCALBIN ) /golangci-lint run --fix --verbose
128129
129130PROCS? =$(shell expr $(shell nproc --ignore 2) / 2)
Original file line number Diff line number Diff line change 11module github.com/openstack-k8s-operators/swift-operator/api
22
3- go 1.21
3+ go 1.24
44
55require (
66 github.com/onsi/ginkgo/v2 v2.20.1
Original file line number Diff line number Diff line change 11module github.com/openstack-k8s-operators/swift-operator
22
3- go 1.21
3+ go 1.24
44
55require (
66 github.com/go-logr/logr v1.4.3
You can’t perform that action at this time.
0 commit comments