Skip to content

Commit fc122cc

Browse files
authored
Merge branch 'ionos-cloud:main' into add-home-lab-friendly-cilium-clusterclass+
2 parents 5de8f96 + fc79f9d commit fc122cc

40 files changed

+647
-555
lines changed

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
codespell:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4.1.1
9+
- uses: actions/checkout@v5
1010
- uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2.1
1111
with:
1212
skip: .git,_artifacts,*.sum

.github/workflows/container-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: build image
2424
runs-on: "ubuntu-latest"
2525
steps:
26-
- uses: actions/checkout@v4.1.1
26+
- uses: actions/checkout@v5
2727

2828
- name: Generate lowercase repository name
2929
run: |
@@ -54,7 +54,7 @@ jobs:
5454

5555
- name: Scan image
5656
if: github.event_name == 'pull_request'
57-
uses: aquasecurity/trivy-action@0.32.0
57+
uses: aquasecurity/trivy-action@0.33.1
5858
id: scan
5959
with:
6060
scan-ref: ${{ steps.meta.outputs.tags }}

.github/workflows/e2e.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
steps:
2121
- name: Check out branch ${{ github.ref }}
2222
if: ${{ github.event_name == 'push' }}
23-
uses: actions/checkout@v4.1.1
23+
uses: actions/checkout@v5
2424

2525
- name: Check out PR ${{ github.event.pull_request.number }}
2626
if: ${{ github.event_name == 'pull_request_target' }}
27-
uses: actions/checkout@v4.1.1
27+
uses: actions/checkout@v5
2828
with:
2929
repository: ${{ github.event.pull_request.head.repo.full_name }}
3030
ref: ${{ github.event.pull_request.head.sha }}
3131

32-
- uses: actions/setup-go@v5
32+
- uses: actions/setup-go@v6
3333
with:
3434
go-version-file: go.mod
3535

@@ -41,7 +41,7 @@ jobs:
4141
run: "make test-e2e GINKGO_SKIP=${{ env.SKIP_E2E }}"
4242

4343
- name: Upload artifacts
44-
uses: actions/upload-artifact@v4
44+
uses: actions/upload-artifact@v5
4545
if: success() || failure()
4646
with:
4747
name: logs

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
name: lint
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4.1.1
16-
- uses: actions/setup-go@v5
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-go@v6
1717
with:
1818
go-version-file: go.mod
1919
- name: golangci-lint
@@ -26,7 +26,7 @@ jobs:
2626
name: yamllint
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v4.1.1
29+
- uses: actions/checkout@v5
3030
- uses: ibiqlik/action-yamllint@v3
3131
with:
3232
format: github
@@ -35,7 +35,7 @@ jobs:
3535
name: actionlint
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@v4.1.1
38+
- uses: actions/checkout@v5
3939
- name: Download actionlint
4040
id: get_actionlint
4141
run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
- name: Set env
1818
run: echo "RELEASE_TAG=${GITHUB_REF##refs/tags/}" >> "$GITHUB_ENV"
1919
- name: checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
fetch-depth: 1
2323
- name: Set up Go
24-
uses: actions/setup-go@v5
24+
uses: actions/setup-go@v6
2525
with:
2626
go-version-file: go.mod
2727
- name: generate release artifacts

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ jobs:
2727

2828
- name: checkout PR ${{ github.event.pull_request.number }}
2929
if: github.event_name == 'pull_request_target'
30-
uses: actions/checkout@v4.1.1
30+
uses: actions/checkout@v5
3131
with:
3232
fetch-depth: 0 # for SonarQube
3333
repository: ${{ github.event.pull_request.head.repo.full_name }}
3434
ref: ${{ github.event.pull_request.head.sha }}
3535

3636
- name: checkout
3737
if: github.event_name == 'push'
38-
uses: actions/checkout@v4.1.1
38+
uses: actions/checkout@v5
3939
with:
4040
fetch-depth: 0 # for SonarQube
4141

42-
- uses: actions/setup-go@v5
42+
- uses: actions/setup-go@v6
4343
with:
4444
go-version-file: go.mod
4545

@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: SonarQube for PR ${{ github.event.pull_request.number }}
5050
if: github.event_name == 'pull_request_target'
51-
uses: SonarSource/sonarqube-scan-action@v5.2.0
51+
uses: SonarSource/sonarqube-scan-action@v6
5252
with:
5353
args: >
5454
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }}
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: SonarQube
6161
if: github.event_name == 'push'
62-
uses: SonarSource/sonarqube-scan-action@v5.2.0
62+
uses: SonarSource/sonarqube-scan-action@v6
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6565
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ linters:
102102
text: (Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)
103103
- path: (.+)\.go$
104104
text: (G104|G307)
105+
- linters:
106+
- staticcheck
107+
text: 'SA1019: .*\.Status\.(FailureMessage|FailureReason) is deprecated: .*'
108+
- linters:
109+
- revive
110+
text: 'var-naming: avoid meaningless package names'
105111
paths:
106112
- zz_generated.*\.go$
107113
- .*conversion.*\.go$

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Maintainers
2-
* @65278 @avorima @lubedacht @pborn-ionos @mcbenjemaa @wikkyk
2+
* @65278 @pborn-ionos @mcbenjemaa @wikkyk

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23 AS builder
2+
FROM golang:1.24 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
181181
## Tool Versions
182182
KUSTOMIZE_VERSION ?= v5.0.0
183183
CONTROLLER_TOOLS_VERSION ?= v0.16.5
184-
ENVTEST_VERSION ?= latest
184+
ENVTEST_VERSION ?= 42a14a36c13b95dd6bc8b4ba69c181b16d50e3c0 # last version to support go1.24
185185

186186
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
187187
.PHONY: kustomize

0 commit comments

Comments
 (0)