Skip to content
This repository was archived by the owner on Dec 16, 2025. It is now read-only.

Commit 3278995

Browse files
authored
✨ update images and go version (#203)
feat: update images and go version Signed-off-by: Jan Schoone <[email protected]>
1 parent 9b8db45 commit 3278995

16 files changed

+40
-32
lines changed

.builder-image-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.2
1+
0.1.3

.github/actions/setup-go/action.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ runs:
66
- name: Install go
77
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
88
with:
9+
go-version: "1.22"
910
go-version-file: "go.mod"
1011
cache: true
1112
cache-dependency-path: go.sum

.github/renovate/golang.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
// https://docs.renovatebot.com/configuration-options/#constraints
66
"constraints": {
7-
"go": "1.21"
7+
"go": "1.22"
88
},
99
packageRules: [
1010
{

.github/workflows/pr-lint.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
2323
runs-on: ubuntu-latest
2424
container:
25-
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.2
25+
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.3
2626
credentials:
2727
username: ${{ github.actor }}
2828
password: ${{ secrets.github_token }}
@@ -32,6 +32,8 @@ jobs:
3232
with:
3333
ref: ${{ github.event.pull_request.head.sha }}
3434

35+
- uses: ./.github/actions/setup-go
36+
3537
- name: Fixup git permissions
3638
# https://github.com/actions/checkout/issues/766
3739
shell: bash

.github/workflows/release.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ jobs:
7575
cache-from: type=gha, scope=${{ github.workflow }}
7676
cache-to: type=gha, mode=max, scope=${{ github.workflow }}
7777

78-
7978
- name: Sign Container Images
8079
run: |
8180
cosign sign --yes ghcr.io/sovereigncloudstack/cspo@${{ steps.docker_build_release_cspo.outputs.digest }}
@@ -140,11 +139,7 @@ jobs:
140139
fetch-depth: 0
141140

142141
- name: Install go
143-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
144-
with:
145-
go-version-file: "go.mod"
146-
cache: true
147-
cache-dependency-path: go.sum
142+
uses: ./.github/actions/setup-go
148143

149144
- name: install kustomize
150145
run: |

.github/workflows/schedule-scan-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Trivy
1010
runs-on: ubuntu-latest
1111
container:
12-
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.2
12+
image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.3
1313
credentials:
1414
username: ${{ github.actor }}
1515
password: ${{ secrets.github_token }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ tmp_*
7272
.cspotemplate.yaml
7373
.secret.yaml
7474
.release
75+
76+
.config

.golangci.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ linters:
77
- bodyclose
88
- containedctx
99
- contextcheck
10+
- copyloopvar
1011
- durationcheck
1112
- errchkjson
1213
- errname
1314
- errorlint
1415
- exhaustive
15-
- exportloopref
1616
- forcetypeassert
1717
- gci
1818
# - goconst
@@ -86,10 +86,6 @@ linters-settings:
8686
allow-unused: false
8787
allow-leading-space: false
8888
require-specific: true
89-
staticcheck:
90-
go: "1.21"
91-
stylecheck:
92-
go: "1.21"
9389
checks: ["all", "-ST1006"]
9490
dot-import-whitelist:
9591
- "github.com/onsi/gomega"
@@ -101,6 +97,9 @@ linters-settings:
10197
- performance
10298
- experimental
10399
- opinionated
100+
settings:
101+
hugeParam:
102+
sizeThreshold: 120
104103
revive:
105104
enable-all-rules: true
106105
rules:
@@ -141,7 +140,14 @@ linters-settings:
141140
severity: warning
142141
disabled: false
143142
arguments:
144-
- [ "call-chain", "loop", "method-call", "recover", "immediate-recover", "return"] # yamllint disable-line rule:line-length
143+
- [
144+
"call-chain",
145+
"loop",
146+
"method-call",
147+
"recover",
148+
"immediate-recover",
149+
"return",
150+
] # yamllint disable-line rule:line-length
145151
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#exported
146152
- name: exported
147153
severity: warning
@@ -224,7 +230,7 @@ linters-settings:
224230
- name: struct-tag
225231
disabled: true
226232
unused:
227-
go: "1.21"
233+
go: "1.22"
228234
usestdlibvars:
229235
# Suggest the use of http.MethodXX.
230236
# Default: true
@@ -285,10 +291,11 @@ issues:
285291
- linters:
286292
- wrapcheck
287293
path: _test\.go
294+
exclude-dirs:
295+
- vendor$
296+
288297
run:
289298
timeout: 10m
290-
go: "1.21"
299+
go: "1.22"
291300
allow-parallel-runners: true
292301
modules-download-mode: vendor
293-
skip-dirs:
294-
- vendor$

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
8989
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/controller-gen)
9090
controller-gen: $(CONTROLLER_GEN) ## Build a local copy of controller-gen
9191
$(CONTROLLER_GEN): # Build controller-gen from tools folder.
92-
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
92+
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.2
9393

9494
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/kustomize)
9595
kustomize: $(KUSTOMIZE) ## Build a local copy of kustomize
@@ -338,7 +338,7 @@ ifeq ($(BUILD_IN_CONTAINER),true)
338338
else
339339
go version
340340
golangci-lint version
341-
golangci-lint run -v --out-format=github-actions
341+
golangci-lint run -v --out-format=colored-line-number
342342
endif
343343

344344
.PHONY: lint-yaml

config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.2
77
name: openstackclusterstackreleases.infrastructure.clusterstack.x-k8s.io
88
spec:
99
group: infrastructure.clusterstack.x-k8s.io

0 commit comments

Comments
 (0)