Skip to content

Commit c487369

Browse files
authored
Merge pull request #26 from sapcc/add-periodic-reconciliation
add periodic reconciliation
2 parents b6d18b8 + 971c307 commit c487369

File tree

17 files changed

+136
-83
lines changed

17 files changed

+136
-83
lines changed

.github/renovate.json

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"commitMessageAction": "Renovate: Update",
1616
"constraints": {
17-
"go": "1.24"
17+
"go": "1.25"
1818
},
1919
"dependencyDashboardOSVVulnerabilitySummary": "all",
2020
"osvVulnerabilityAlerts": true,
@@ -25,9 +25,13 @@
2525
"packageRules": [
2626
{
2727
"matchPackageNames": [
28-
"golang"
28+
"/.*/"
2929
],
30-
"allowedVersions": "1.24.x"
30+
"matchUpdateTypes": [
31+
"minor",
32+
"patch"
33+
],
34+
"groupName": "External dependencies"
3135
},
3236
{
3337
"matchPackageNames": [
@@ -38,20 +42,30 @@
3842
},
3943
{
4044
"matchPackageNames": [
41-
"!/^github\\.com\\/sapcc\\/.*/",
42-
"/.*/"
45+
"go",
46+
"golang",
47+
"actions/go-versions"
48+
],
49+
"groupName": "golang",
50+
"separateMinorPatch": true
51+
},
52+
{
53+
"matchPackageNames": [
54+
"go",
55+
"golang",
56+
"actions/go-versions"
4357
],
4458
"matchUpdateTypes": [
4559
"minor",
46-
"patch"
60+
"major"
4761
],
48-
"groupName": "External dependencies"
62+
"dependencyDashboardApproval": true
4963
},
5064
{
5165
"matchPackageNames": [
5266
"/^k8s.io\\//"
5367
],
54-
"allowedVersions": "0.28.x"
68+
"allowedVersions": "0.33.x"
5569
}
5670
],
5771
"prHourlyLimit": 0,

.github/workflows/checks.yaml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Check out code
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828
- name: Set up Go
29-
uses: actions/setup-go@v5
29+
uses: actions/setup-go@v6
3030
with:
3131
check-latest: true
32-
go-version: 1.24.6
32+
go-version: 1.25.7
3333
- name: Run golangci-lint
34-
uses: golangci/golangci-lint-action@v8
34+
uses: golangci/golangci-lint-action@v9
3535
with:
3636
version: latest
3737
- name: Delete pre-installed shellcheck
@@ -41,17 +41,15 @@ jobs:
4141
- name: Dependency Licenses Review
4242
run: make check-dependency-licenses
4343
- name: Check for spelling errors
44-
uses: reviewdog/action-misspell@v1
45-
with:
46-
exclude: ./vendor/*
47-
fail_on_error: true
48-
github_token: ${{ secrets.GITHUB_TOKEN }}
49-
ignore: importas
50-
reporter: github-check
44+
uses: crate-ci/typos@v1
45+
env:
46+
CLICOLOR: "1"
47+
- name: Delete typos binary
48+
run: rm typos
5149
- name: Check if source code files have license header
5250
run: make check-addlicense
5351
- name: REUSE Compliance Check
54-
uses: fsfe/reuse-action@v5
52+
uses: fsfe/reuse-action@v6
5553
- name: Install govulncheck
5654
run: go install golang.org/x/vuln/cmd/govulncheck@latest
5755
- name: Run govulncheck

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Check out code
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
- name: Set up Go
32-
uses: actions/setup-go@v5
32+
uses: actions/setup-go@v6
3333
with:
3434
check-latest: true
35-
go-version: 1.24.6
35+
go-version: 1.25.7
3636
- name: Build all binaries
3737
run: make build-all
3838
test:
@@ -42,11 +42,11 @@ jobs:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- name: Check out code
45-
uses: actions/checkout@v5
45+
uses: actions/checkout@v6
4646
- name: Set up Go
47-
uses: actions/setup-go@v5
47+
uses: actions/setup-go@v6
4848
with:
4949
check-latest: true
50-
go-version: 1.24.6
50+
go-version: 1.25.7
5151
- name: Run tests and generate coverage report
5252
run: make build/cover.out

.github/workflows/codeql.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Check out code
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
- name: Set up Go
32-
uses: actions/setup-go@v5
32+
uses: actions/setup-go@v6
3333
with:
3434
check-latest: true
35-
go-version: 1.24.6
35+
go-version: 1.25.7
3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@v3
37+
uses: github/codeql-action/init@v4
3838
with:
3939
languages: go
4040
queries: security-extended
4141
- name: Autobuild
42-
uses: github/codeql-action/autobuild@v3
42+
uses: github/codeql-action/autobuild@v4
4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@v3
44+
uses: github/codeql-action/analyze@v4

.github/workflows/container-registry-ghcr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Check out code
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525
- name: Log in to the Container registry
2626
uses: docker/login-action@v3
2727
with:

.golangci.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ linters:
5555
- govet
5656
- ineffassign
5757
- intrange
58-
- misspell
58+
- iotamixing
59+
- modernize
5960
- nilerr
6061
- nolintlint
6162
- nosprintfhostport
@@ -143,6 +144,13 @@ linters:
143144
enable-all: true
144145
nolintlint:
145146
require-specific: true
147+
modernize:
148+
disable:
149+
# omitzero requires removing omitempty tags in kubernetes api struct types which are nested, which is interpreted by controller-gen and breaks the CRDs.
150+
- omitzero
151+
perfsprint:
152+
# modernize generates nicer fix code
153+
concat-loop: false
146154
staticcheck:
147155
dot-import-whitelist:
148156
- github.com/majewsky/gg/option
@@ -167,13 +175,13 @@ linters:
167175
exclusions:
168176
generated: lax
169177
presets:
170-
- comments
171178
- common-false-positives
172179
- legacy
173180
- std-error-handling
174181
rules:
175182
- linters:
176183
- bodyclose
184+
- revive
177185
path: _test\.go
178186
# It is idiomatic Go to reuse the name 'err' with ':=' for subsequent errors.
179187
# Ref: https://go.dev/doc/effective_go#redeclaration

.license-scan-overrides.jsonl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{"name": "github.com/chzyer/logex", "licenceType": "MIT"}
2+
{"name": "github.com/grpc-ecosystem/go-grpc-middleware/v2", "licenceType": "Apache-2.0"}
23
{"name": "github.com/hashicorp/vault/api/auth/approle", "licenceType": "MPL-2.0"}
34
{"name": "github.com/jpillora/longestcommon", "licenceType": "MIT"}
45
{"name": "github.com/logrusorgru/aurora", "licenceType": "Unlicense"}

.typos.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# SPDX-FileCopyrightText: 2025 SAP SE
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
[default.extend-words]
6+
7+
[files]
8+
extend-exclude = [
9+
"go.mod",
10+
]

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Build the manager binary
5-
FROM golang:1.24 as builder
5+
FROM golang:1.25 as builder
66
ARG TARGETOS
77
ARG TARGETARCH
88

0 commit comments

Comments
 (0)