Skip to content

Commit 7df85a8

Browse files
3deep5me3deep5me
authored
Merge branch 'main' into add-home-lab-friendly-cilium-clusterclass+
2 parents 782bdf5 + 3c32e3d commit 7df85a8

File tree

9 files changed

+124
-130
lines changed

9 files changed

+124
-130
lines changed

‎.github/workflows/container-image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

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

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
with:
1818
go-version-file: go.mod
1919
- name: golangci-lint
20-
uses: golangci/golangci-lint-action@v7
20+
uses: golangci/golangci-lint-action@v8
2121
with:
22-
version: v2.0.2
22+
version: v2.1.6
23+
args: '--timeout 10m'
2324

2425
yamllint:
2526
name: yamllint

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.1.0
51+
uses: SonarSource/sonarqube-scan-action@v5.2.0
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.1.0
62+
uses: SonarSource/sonarqube-scan-action@v5.2.0
6363
env:
6464
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6565
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ _artifacts
4747
test/e2e/config/*-envsubst.yaml
4848

4949
.tool-versions
50+
e2e-env*.yaml
51+

‎clusterctl-settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "infrastructure-proxmox",
33
"config": {
44
"componentsFile": "infrastructure-components.yaml",
5-
"nextVersion": "v0.7.1"
5+
"nextVersion": "v0.7.2"
66
}
77
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/buger/goterm v1.0.4 // indirect
4949
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5050
github.com/cespare/xxhash/v2 v2.3.0 // indirect
51-
github.com/cloudflare/circl v1.3.7 // indirect
51+
github.com/cloudflare/circl v1.6.1 // indirect
5252
github.com/coreos/go-semver v0.3.1 // indirect
5353
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
5454
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
6565
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
6666
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
6767
github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
68-
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
69-
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
68+
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
69+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
7070
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
7171
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
7272
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=

‎hack/tools/go.mod‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ go 1.23.8
44

55
require (
66
github.com/braydonk/yaml v0.9.0
7-
github.com/golangci/golangci-lint/v2 v2.1.6
8-
github.com/google/yamlfmt v0.17.0
9-
github.com/vektra/mockery/v2 v2.53.3
10-
golang.org/x/tools v0.33.0
7+
github.com/golangci/golangci-lint/v2 v2.2.2
8+
github.com/google/yamlfmt v0.17.2
9+
github.com/vektra/mockery/v2 v2.53.4
10+
golang.org/x/tools v0.34.0
1111
)
1212

1313
require (
1414
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
1515
4d63.com/gochecknoglobals v0.2.2 // indirect
16+
codeberg.org/chavacava/garif v0.2.0 // indirect
1617
github.com/4meepo/tagalign v1.4.2 // indirect
17-
github.com/Abirdcfly/dupword v0.1.3 // indirect
18+
github.com/Abirdcfly/dupword v0.1.6 // indirect
19+
github.com/AlwxSin/noinlineerr v1.0.4 // indirect
1820
github.com/Antonboom/errname v1.1.0 // indirect
1921
github.com/Antonboom/nilnil v1.1.0 // indirect
2022
github.com/Antonboom/testifylint v1.6.1 // indirect
@@ -23,34 +25,34 @@ require (
2325
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
2426
github.com/Masterminds/semver/v3 v3.3.1 // indirect
2527
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
26-
github.com/alecthomas/chroma/v2 v2.17.2 // indirect
28+
github.com/alecthomas/chroma/v2 v2.19.0 // indirect
2729
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
2830
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
2931
github.com/alexkohler/prealloc v1.0.0 // indirect
3032
github.com/alingse/asasalint v0.0.11 // indirect
3133
github.com/alingse/nilnesserr v0.2.0 // indirect
32-
github.com/ashanbrown/forbidigo v1.6.0 // indirect
33-
github.com/ashanbrown/makezero v1.2.0 // indirect
34+
github.com/ashanbrown/forbidigo/v2 v2.1.0 // indirect
35+
github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
3436
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3537
github.com/beorn7/perks v1.0.1 // indirect
3638
github.com/bkielbasa/cyclop v1.2.3 // indirect
3739
github.com/blizzy78/varnamelen v0.8.0 // indirect
3840
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
3941
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
42+
github.com/bombsimon/wsl/v5 v5.0.0 // indirect
4043
github.com/breml/bidichk v0.3.3 // indirect
4144
github.com/breml/errchkjson v0.4.1 // indirect
4245
github.com/butuzov/ireturn v0.4.0 // indirect
4346
github.com/butuzov/mirror v1.3.0 // indirect
4447
github.com/catenacyber/perfsprint v0.9.1 // indirect
45-
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
48+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
4649
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4750
github.com/charithe/durationcheck v0.0.10 // indirect
4851
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
4952
github.com/charmbracelet/lipgloss v1.1.0 // indirect
5053
github.com/charmbracelet/x/ansi v0.8.0 // indirect
5154
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
5255
github.com/charmbracelet/x/term v0.2.1 // indirect
53-
github.com/chavacava/garif v0.1.0 // indirect
5456
github.com/chigopher/pathlib v0.19.1 // indirect
5557
github.com/ckaznocha/intrange v0.3.1 // indirect
5658
github.com/curioswitch/go-reassign v0.3.0 // indirect
@@ -74,7 +76,7 @@ require (
7476
github.com/go-toolsmith/astp v1.1.0 // indirect
7577
github.com/go-toolsmith/strparse v1.1.0 // indirect
7678
github.com/go-toolsmith/typep v1.1.0 // indirect
77-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
79+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
7880
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
7981
github.com/gobwas/glob v0.2.3 // indirect
8082
github.com/gofrs/flock v0.12.1 // indirect
@@ -83,9 +85,10 @@ require (
8385
github.com/golangci/go-printf-func-name v0.1.0 // indirect
8486
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
8587
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
86-
github.com/golangci/misspell v0.6.0 // indirect
87-
github.com/golangci/plugin-module-register v0.1.1 // indirect
88+
github.com/golangci/misspell v0.7.0 // indirect
89+
github.com/golangci/plugin-module-register v0.1.2 // indirect
8890
github.com/golangci/revgrep v0.8.0 // indirect
91+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
8992
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
9093
github.com/google/go-cmp v0.7.0 // indirect
9194
github.com/gordonklaus/ineffassign v0.1.0 // indirect
@@ -100,34 +103,35 @@ require (
100103
github.com/huandu/xstrings v1.4.0 // indirect
101104
github.com/iancoleman/strcase v0.3.0 // indirect
102105
github.com/inconshreveable/mousetrap v1.1.0 // indirect
103-
github.com/jgautheron/goconst v1.8.1 // indirect
106+
github.com/jgautheron/goconst v1.8.2 // indirect
104107
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
105108
github.com/jinzhu/copier v0.4.0 // indirect
106-
github.com/jjti/go-spancheck v0.6.4 // indirect
109+
github.com/jjti/go-spancheck v0.6.5 // indirect
107110
github.com/julz/importas v0.2.0 // indirect
108111
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
109112
github.com/kisielk/errcheck v1.9.0 // indirect
110113
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
111114
github.com/kulti/thelper v0.6.3 // indirect
112115
github.com/kunwardeep/paralleltest v1.0.14 // indirect
113116
github.com/lasiar/canonicalheader v1.1.2 // indirect
114-
github.com/ldez/exptostd v0.4.3 // indirect
115-
github.com/ldez/gomoddirectives v0.6.1 // indirect
117+
github.com/ldez/exptostd v0.4.4 // indirect
118+
github.com/ldez/gomoddirectives v0.7.0 // indirect
116119
github.com/ldez/grignotin v0.9.0 // indirect
117120
github.com/ldez/tagliatelle v0.7.1 // indirect
118-
github.com/ldez/usetesting v0.4.3 // indirect
121+
github.com/ldez/usetesting v0.5.0 // indirect
119122
github.com/leonklingele/grouper v1.1.2 // indirect
120123
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
121124
github.com/macabu/inamedparam v0.2.0 // indirect
122-
github.com/manuelarte/funcorder v0.2.1 // indirect
125+
github.com/manuelarte/embeddedstructfieldcheck v0.3.0 // indirect
126+
github.com/manuelarte/funcorder v0.5.0 // indirect
123127
github.com/maratori/testableexamples v1.0.0 // indirect
124128
github.com/maratori/testpackage v1.1.1 // indirect
125129
github.com/matoous/godox v1.1.0 // indirect
126130
github.com/mattn/go-colorable v0.1.14 // indirect
127131
github.com/mattn/go-isatty v0.0.20 // indirect
128132
github.com/mattn/go-runewidth v0.0.16 // indirect
129133
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
130-
github.com/mgechev/revive v1.9.0 // indirect
134+
github.com/mgechev/revive v1.10.0 // indirect
131135
github.com/mitchellh/go-homedir v1.1.0 // indirect
132136
github.com/mitchellh/mapstructure v1.5.0 // indirect
133137
github.com/moricho/tparallel v0.3.2 // indirect
@@ -136,7 +140,6 @@ require (
136140
github.com/nishanths/exhaustive v0.12.0 // indirect
137141
github.com/nishanths/predeclared v0.2.2 // indirect
138142
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
139-
github.com/olekukonko/tablewriter v0.0.5 // indirect
140143
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
141144
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
142145
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
@@ -158,13 +161,13 @@ require (
158161
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
159162
github.com/sagikazarmark/locafero v0.7.0 // indirect
160163
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
161-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
164+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
162165
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
163-
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
164-
github.com/securego/gosec/v2 v2.22.3 // indirect
166+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
167+
github.com/securego/gosec/v2 v2.22.5 // indirect
165168
github.com/sirupsen/logrus v1.9.3 // indirect
166169
github.com/sivchari/containedctx v1.0.3 // indirect
167-
github.com/sonatard/noctx v0.1.0 // indirect
170+
github.com/sonatard/noctx v0.3.4 // indirect
168171
github.com/sourcegraph/conc v0.3.0 // indirect
169172
github.com/sourcegraph/go-diff v0.7.0 // indirect
170173
github.com/spf13/afero v1.14.0 // indirect
@@ -186,7 +189,7 @@ require (
186189
github.com/ultraware/funlen v0.2.0 // indirect
187190
github.com/ultraware/whitespace v0.2.0 // indirect
188191
github.com/uudashr/gocognit v1.2.0 // indirect
189-
github.com/uudashr/iface v1.3.1 // indirect
192+
github.com/uudashr/iface v1.4.0 // indirect
190193
github.com/xen0n/gosmopolitan v1.3.0 // indirect
191194
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
192195
github.com/yagipy/maintidx v1.0.0 // indirect
@@ -195,20 +198,20 @@ require (
195198
gitlab.com/bosi/decorder v0.4.2 // indirect
196199
go-simpler.org/musttag v0.13.1 // indirect
197200
go-simpler.org/sloglint v0.11.0 // indirect
201+
go.augendre.info/arangolint v0.2.0 // indirect
198202
go.augendre.info/fatcontext v0.8.0 // indirect
199203
go.uber.org/atomic v1.9.0 // indirect
200204
go.uber.org/automaxprocs v1.6.0 // indirect
201205
go.uber.org/multierr v1.11.0 // indirect
202206
go.uber.org/zap v1.24.0 // indirect
203207
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
204208
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
205-
golang.org/x/mod v0.24.0 // indirect
206-
golang.org/x/sync v0.14.0 // indirect
207-
golang.org/x/sys v0.33.0 // indirect
209+
golang.org/x/mod v0.26.0 // indirect
210+
golang.org/x/sync v0.15.0 // indirect
211+
golang.org/x/sys v0.34.0 // indirect
208212
golang.org/x/term v0.29.0 // indirect
209-
golang.org/x/text v0.24.0 // indirect
213+
golang.org/x/text v0.26.0 // indirect
210214
google.golang.org/protobuf v1.36.6 // indirect
211-
gopkg.in/yaml.v2 v2.4.0 // indirect
212215
gopkg.in/yaml.v3 v3.0.1 // indirect
213216
honnef.co/go/tools v0.6.1 // indirect
214217
mvdan.cc/gofumpt v0.8.0 // indirect

0 commit comments

Comments
 (0)