Skip to content

Commit 1df5848

Browse files
authored
Merge branch 'main' into renovate/ghcr.io-siderolabs-kubelet-1.x
2 parents 166209c + 876cb08 commit 1df5848

27 files changed

Lines changed: 351 additions & 757 deletions

.github/workflows/flate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fetch-depth: 0
4141

4242
- name: Install Flate
43-
uses: home-operations/flate/action@bf3405a189626478b0aa6ec98dc4d6f7d419df17 # v0.4.12
43+
uses: home-operations/flate/action@317908633d5acf3fc40f7fa02a5153a0499362a0 # v0.6.4
4444

4545
- name: Run Flate
4646
id: flate

.github/workflows/template-e2e-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ jobs:
5757
sudo apt-get install --yes --no-install-recommends gettext-base qemu-system-x86 qemu-utils ovmf
5858
5959
- name: Setup mise
60-
uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
60+
uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
6161
env:
6262
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
6363

6464
- name: Boot maintenance-mode nodes
6565
id: cluster
66-
uses: home-operations/talosctl-cluster-action@42a2d1c476f87245e2d1882ec825fb31368b9686 # v0.1.6
66+
uses: home-operations/talosctl-cluster-action@fb6a31bf5de43218acc80d2e23958a16eee7380c # v0.2.2
6767
with:
6868
config: ./.github/template-tests/e2e/talos-cluster.yaml
6969
cache: true

.github/workflows/template-e2e.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
persist-credentials: false
5656

5757
- name: Setup mise
58-
uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
58+
uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
5959
env:
6060
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
6161

@@ -83,7 +83,7 @@ jobs:
8383
persist-credentials: false
8484

8585
- name: Setup mise
86-
uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
86+
uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
8787
env:
8888
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
8989

@@ -115,7 +115,7 @@ jobs:
115115
persist-credentials: false
116116

117117
- name: Setup mise
118-
uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
118+
uses: jdx/mise-action@c2a87611a18de5b3828c5652fe268e992400cb5c # v4.3.0
119119
with:
120120
experimental: true
121121
install_args: --locked
@@ -138,7 +138,7 @@ jobs:
138138
run: oxfmt --check ./.sops.yaml ./bootstrap ./kubernetes ./talos
139139

140140
- name: Install flate
141-
uses: home-operations/flate/action@bf3405a189626478b0aa6ec98dc4d6f7d419df17 # v0.4.12
141+
uses: home-operations/flate/action@317908633d5acf3fc40f7fa02a5153a0499362a0 # v0.6.4
142142
with:
143143
base: ""
144144

.mise/config.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ TALOSCONFIG = "{{config_root}}/talos/talosconfig"
66
JUST_UNSTABLE = "1"
77

88
[tools]
9-
uv = "0.12.5" # required:template
10-
age = "1.3.1"
11-
cloudflared = "2026.8.2"
12-
flux2 = "2.9.4"
13-
gh = "2.98.0"
9+
uv = "0.12.9" # required:template
10+
age = "1.3.2"
11+
cloudflared = "2026.8.3"
12+
flux2 = "2.9.5"
13+
gh = "2.99.0"
1414
gum = "2.0.0"
1515
helm = "4.2.4"
1616
helmfile = "1.7.4"
1717
jq = "1.8.2"
1818
just = "1.58.0"
1919
kubeconform = "0.8.0"
20-
kubectl = "1.36.4"
20+
kubectl = "1.37.0"
2121
kustomize = "5.8.1"
22-
lefthook = "2.1.10"
23-
node = "24.19.0"
24-
oxfmt = "0.64.0"
25-
sd = "1.1.0" # required:template
22+
lefthook = "2.1.12"
23+
node = "24.20.0"
24+
oxfmt = "0.66.0"
25+
sd = "1.1.0" # required:template
2626
sops = "3.13.3"
27-
talosctl = "1.13.7"
28-
"github:postfinance/topf" = "v0.5.0"
27+
talosctl = "1.14.0"
28+
"github:postfinance/topf" = "v0.6.0"
2929
yq = "4.53.6"
30-
zizmor = "1.29.0"
30+
zizmor = "1.30.0"
3131

3232
[hooks]
3333
postinstall = "lefthook install"

.mise/mise.lock

Lines changed: 111 additions & 564 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.renovaterc.json5

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
enabled: true,
77
schedule: ["before 3am on the first day of the month"],
88
commitMessageExtra: "({{manager}})",
9-
additionalBranchPrefix: "{{manager}}-"
9+
additionalBranchPrefix: "{{manager}}-",
1010
},
1111
packageRules: [
1212
{
@@ -19,14 +19,16 @@
1919
description: "Mise Tools Group",
2020
matchManagers: ["mise"],
2121
groupName: "mise tools",
22-
groupSlug: "mise-tools",
2322
minimumReleaseAge: "3 days",
2423
},
2524
{
2625
description: "Talos Group",
2726
groupName: "talos",
28-
matchPackageNames: ["ghcr.io/siderolabs/installer", "siderolabs/talos", "talosctl"],
29-
minimumGroupSize: 3,
27+
matchPackageNames: ["siderolabs/talos"],
28+
group: {
29+
commitMessageTopic: "{{{groupName}}} group",
30+
},
31+
minimumGroupSize: 2,
3032
},
3133
{
3234
description: "Flux Operator Group",

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ These guidelines provide a strong baseline, but there are always exceptions and
9191

9292
📍 _**Having trouble installing the tools?** Try unsetting the `GITHUB_TOKEN` env var and then run these commands again_
9393

94+
📍 _**Platforms:** `.mise/mise.lock` pins tool downloads for Linux on amd64 and arm64 and macOS on arm64 (`linux-x64`, `linux-arm64`, `macos-arm64`). If you also need musl (e.g. Alpine), Windows or Intel macOS, add those platforms to the lockfile and commit it: `mise lock -p linux-x64-musl,linux-arm64-musl,windows-x64,macos-x64`_
95+
9496
5. Logout of the GitHub Container Registry as this may cause authorization problems in future steps when using the public registry:
9597

9698
```sh

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.0.0"
44
requires-python = ">=3.14"
55
dependencies = [
66
"makejinja==2.8.2",
7-
"pydantic==2.13.4",
7+
"pydantic==2.13.5",
88
]
99

1010
[dependency-groups]

template/config/kubernetes/apps/default/echo/app/ocirepository.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ spec:
99
mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
1010
operation: copy
1111
ref:
12-
tag: 0.2.3
12+
tag: 0.2.5
1313
url: oci://ghcr.io/home-operations/charts/echo

template/config/kubernetes/apps/flux-system/flux-instance/app/ocirepository.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ spec:
99
mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
1010
operation: copy
1111
ref:
12-
tag: 0.58.1
12+
tag: 0.59.0
1313
url: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-instance

0 commit comments

Comments
 (0)