Skip to content

Commit e559869

Browse files
mvanhornmvanhorn
committed
Merge remote-tracking branch 'upstream/main' into fix/1024-teams-notifications-shoutrrr-fork
2 parents 764495f + 1f7f15f commit e559869

21 files changed

Lines changed: 341 additions & 354 deletions

.clomonitor.yml renamed to .clomonitor.yaml

File renamed without changes.

‎.config/goreleaser.yaml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project_name: kured
55
before:
66
hooks:
77
- go mod tidy
8-
- sh .config/goreleaser/render-manifest.sh {{ .Version }} ghcr.io/{{ .Env.IMAGE_NAME }}
8+
- sh .config/goreleaser/render-manifest.sh {{ .Version }} {{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}
99

1010
builds:
1111
- id: kured
@@ -46,7 +46,7 @@ dockers_v2:
4646
ids:
4747
- kured
4848
images:
49-
- "ghcr.io/{{ .Env.IMAGE_NAME }}"
49+
- "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}"
5050
tags:
5151
- "{{ if ne .Tag .ShortCommit }}{{ .Tag }}{{ end }}"
5252
- "{{ .ShortCommit }}"
@@ -90,6 +90,17 @@ release:
9090
name_template: "Kured {{ .Version }}"
9191
extra_files:
9292
- glob: ".tmp/goreleaser/kured-{{ .Version }}-combined.yaml"
93+
mode: replace
94+
footer: |
95+
## Get involved
96+
97+
As an open source project, we are based on a community of volunteers. Help is always welcomed, at least so we don't feel alone caring about the reboot of your nodes :)
98+
99+
Don't hesitate to onboard by tackling issues labeled as "good-first-issue" in our repositories (or harder ones if you like the challenge!), reviewing patches, improving the documentation, maintaining the charts, or help producing releases...
100+
There are plenty of places you can contribute, and all you need to get started is your motivation to be one of us :)
101+
You can contact us on slack if you want.
102+
103+
Thanks a lot to everyone who contributed to kured since last release!
93104
94105
changelog:
95106
use: github-native

‎.config/mise.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[tools]
2+
actionlint = "latest"
23
cosign = "3.0.6"
3-
go = "1.26.4"
4+
go = "1.26.5"
45
golangci-lint = "2.12.2"
56
goreleaser = "2.16.0"
67
kind = "0.32.0"

.github/dependabot.yml renamed to .github/dependabot.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ updates:
55
directory: "/"
66
schedule:
77
interval: "daily"
8+
groups:
9+
codeql:
10+
patterns:
11+
- "github/codeql-action/*"
812
# Maintain dependencies for gomod
913
- package-ecosystem: "gomod"
1014
directory: "/"

.github/workflows/codeql.yml renamed to .github/workflows/codeql.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ jobs:
4242

4343
steps:
4444
- name: Harden Runner
45-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
45+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
4646
with:
4747
egress-policy: audit
4848

4949
- name: Checkout repository
50-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
50+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5151

5252
# Initializes the CodeQL tools for scanning.
5353
- name: Initialize CodeQL

.github/workflows/dependency-review.yml renamed to .github/workflows/dependency-review.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Harden Runner
20-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
20+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
2121
with:
2222
egress-policy: audit
2323

2424
- name: 'Checkout Repository'
25-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
25+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2626

2727
- name: 'Dependency Review'
2828
uses: actions/dependency-review-action@2031cfc080254a8a887f58cffee85186f0e49e48 # v4.9.0

‎.github/workflows/on-branch-push-and-prs.yaml‎

Lines changed: 57 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,36 @@ permissions:
99
contents: read
1010

1111
jobs:
12+
go-version:
13+
name: Check Go version consistency
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Harden Runner
17+
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
18+
with:
19+
egress-policy: audit
20+
21+
- name: checkout
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
23+
with:
24+
persist-credentials: false
25+
26+
- name: Check Go version consistency
27+
run: make check-go-version
28+
1229
pr-short-tests:
1330
name: Run short go tests
1431
runs-on: ubuntu-latest
1532
steps:
1633
- name: Harden Runner
17-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
34+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
1835
with:
1936
egress-policy: audit
2037

2138
- name: checkout
22-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
39+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2340

24-
- uses: jdx/mise-action@dba19683ed58901619b14f395a24841710cb4925 # v4.1.0
41+
- uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
2542
with:
2643
version: 2026.6.1
2744

@@ -30,30 +47,30 @@ jobs:
3047

3148
- name: Annotate tests
3249
if: always()
33-
uses: guyarb/golang-test-annoations@2941118d7ef622b1b3771d1ff6eae9e90659eb26 # v0.8.0
50+
uses: guyarb/golang-test-annoations@96fc379b171c49932041d6c789e73331a7bdeec1 # v0.9.0
3451
with:
3552
test-results: test.json
3653

3754
# This should not be made a mandatory test
3855
# It is only used to make us aware of any potential security failure that
3956
# should trigger a bump of the image in build/.
4057
pr-vuln-scan:
41-
name: Build image and scan it against known vulnerabilities
58+
name: Trivy scan # Builds image and scan it against known vulnerabilities
4259
runs-on: ubuntu-latest
4360
steps:
4461
- name: Harden Runner
45-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
62+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
4663
with:
4764
egress-policy: audit
4865

49-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
66+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5067

51-
- uses: jdx/mise-action@dba19683ed58901619b14f395a24841710cb4925 # v4.1.0
68+
- uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
5269
with:
5370
version: 2026.6.1
5471

5572
- name: Set up Docker Buildx
56-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
73+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
5774

5875
- name: Build image
5976
run: make dev-image
@@ -68,6 +85,29 @@ jobs:
6885
vuln-type: 'os,library'
6986
severity: 'CRITICAL,HIGH'
7087

88+
e2e-test-matrix:
89+
name: Generate e2e test matrix
90+
runs-on: ubuntu-latest
91+
outputs:
92+
testnames: ${{ steps.matrix.outputs.testnames }}
93+
steps:
94+
- name: Harden Runner
95+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
96+
with:
97+
egress-policy: audit
98+
99+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
100+
101+
- uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
102+
with:
103+
version: 2026.6.1
104+
105+
- name: Generate matrix
106+
id: matrix
107+
run: |
108+
testnames=$(go test -list '^Test' ./tests/kind | jq -R -s -c 'split("\n") | map(select(startswith("Test")))')
109+
echo "testnames=${testnames}" >> "${GITHUB_OUTPUT}"
110+
71111
# This ensures the latest code works with the manifests built from tree.
72112
# It is useful for two things:
73113
# - Test manifests changes (obviously), ensuring they don't break existing clusters
@@ -76,37 +116,27 @@ jobs:
76116
# - Test some features are working as expected.
77117
# Helm charts are _trailing_ releases, while manifests are done during development.
78118
e2e-manifests:
79-
name: End-to-End test with kured with code and manifests from HEAD
119+
name: e2e #End-to-End test with kured with code and manifests from HEAD
80120
runs-on: ubuntu-latest
121+
needs: e2e-test-matrix
81122
strategy:
82123
fail-fast: false
83124
matrix:
84-
testname:
85-
- "TestE2EWithCommand/current"
86-
- "TestE2EWithCommand/previous"
87-
- "TestE2EWithSignal/current"
88-
- "TestE2EWithSignal/previous"
89-
- "TestE2EConcurrentWithCommand/current"
90-
- "TestE2EConcurrentWithCommand/previous"
91-
- "TestE2EConcurrentWithSignal/current"
92-
- "TestE2EConcurrentWithSignal/previous"
93-
- "TestCordonningIsKept/concurrency1"
94-
- "TestCordonningIsKept/concurrency2"
95-
- "TestE2EBlocker/podblocker"
125+
testname: ${{ fromJSON(needs.e2e-test-matrix.outputs.testnames) }}
96126
steps:
97127
- name: Harden Runner
98-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
128+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
99129
with:
100130
egress-policy: audit
101131

102-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
132+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
103133

104-
- uses: jdx/mise-action@dba19683ed58901619b14f395a24841710cb4925 # v4.1.0
134+
- uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
105135
with:
106136
version: 2026.6.1
107137

108138
- name: Set up Docker Buildx
109-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
139+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
110140

111141
- name: Run specific e2e tests
112-
run: make e2e-test ARGS="-run ^${{ matrix.testname }}"
142+
run: make e2e-test ARGS="-run ^${{ matrix.testname }}$"

‎.github/workflows/on-pr-docs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Harden Runner
14-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
14+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
1515
with:
1616
egress-policy: audit
1717

18-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
18+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1919

2020
- name: Link Checker
2121
uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2.8.0

‎.github/workflows/on-pr-goreleaser.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Verify GoReleaser config
2+
on:
3+
pull_request:
4+
paths:
5+
- '.config/goreleaser.yaml'
6+
push:
7+
paths:
8+
- '.config/goreleaser.yaml'
9+
10+
jobs:
11+
check-goreleaser-config:
12+
name: Check GoReleaser config
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Harden Runner
16+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
17+
with:
18+
egress-policy: audit
19+
20+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
21+
22+
- name: Check GoReleaser config
23+
uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 #v7.2.3
24+
with:
25+
version: '~> v2'
26+
args: check
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/on-tag.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ jobs:
2121
packages: write
2222
steps:
2323
- name: Harden Runner
24-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
24+
uses: step-security/harden-runner@bf7454d06d71f1098171f2acdf0cd4708d7b5920 # v2.20.0
2525
with:
2626
egress-policy: audit
2727

28-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
28+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
fetch-depth: 0
3131

32-
- uses: jdx/mise-action@dba19683ed58901619b14f395a24841710cb4925 # v4.1.0
32+
- uses: jdx/mise-action@e6a8b3978addb5a52f2b4cd9d91eafa7f0ab959d # v4.2.0
3333
with:
3434
version: 2026.6.1
3535

3636
- name: Set up QEMU
37-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
37+
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
3838

3939
- name: Set up Docker Buildx
40-
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
40+
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
4141

4242
- name: Build local image for scan
4343
run: make dev-image

0 commit comments

Comments
 (0)