Skip to content

Commit 1a47019

Browse files
screspodscrespod
authored
Add support for k0s 1.32 (#2662)
* Add support for k0s 1.32 * Update calico images to 3.29.3 * f * Add support for updating calico images
1 parent 32be1f6 commit 1a47019

File tree

8 files changed

+33
-27
lines changed

8 files changed

+33
-27
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,11 @@ jobs:
449449
MANGLE_METADATA: "1"
450450
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
451451
run: |
452-
export K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION)
453-
export K0S_GO_VERSION=$(make print-PREVIOUS_K0S_GO_VERSION)
452+
k0s_minor_version=$(make print-PREVIOUS_K0S_VERSION | sed 's/v[0-9]*\.\([0-9]*\).*/\1/')
453+
454+
# update k0s dep version to previous k0s version
455+
./scripts/update-k0s-dep-version.sh "$k0s_minor_version"
456+
454457
export EC_VERSION=$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')-previous-k0s
455458
export APP_VERSION=appver-dev-${{ needs.git-sha.outputs.git_sha }}-previous-k0s
456459
# avoid rate limiting
@@ -469,7 +472,8 @@ jobs:
469472
- name: Export k0s version
470473
id: export
471474
run: |
472-
K0S_VERSION="$(make print-PREVIOUS_K0S_VERSION)"
475+
# K0S_VERSION is now the previous k0s version
476+
K0S_VERSION="$(make print-K0S_VERSION)"
473477
echo "K0S_VERSION=\"$K0S_VERSION\""
474478
echo "k0s_version=$K0S_VERSION" >> "$GITHUB_OUTPUT"
475479

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
1010
ADMIN_CONSOLE_IMAGE_OVERRIDE =
1111
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1212
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
13-
K0S_VERSION = v1.31.11+k0s.0
14-
K0S_GO_VERSION = v1.31.11+k0s.0
15-
PREVIOUS_K0S_VERSION ?= v1.30.14+k0s.0
16-
PREVIOUS_K0S_GO_VERSION ?= v1.30.14+k0s.0
13+
K0S_VERSION = v1.32.7+k0s.0
14+
K0S_GO_VERSION = v1.32.7+k0s.0
15+
PREVIOUS_K0S_VERSION ?= v1.31.11+k0s.0
16+
PREVIOUS_K0S_GO_VERSION ?= v1.31.11+k0s.0
1717
K0S_BINARY_SOURCE_OVERRIDE =
1818
TROUBLESHOOT_VERSION = v0.121.2
1919

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/gorilla/mux v1.8.1
2828
github.com/gosimple/slug v1.15.0
2929
github.com/jedib0t/go-pretty/v6 v6.6.8
30-
github.com/k0sproject/k0s v1.31.12-0.20250721135121-4b887bc48ed8
30+
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf
3131
github.com/ohler55/ojg v1.26.8
3232
github.com/onsi/ginkgo/v2 v2.23.4
3333
github.com/onsi/gomega v1.38.0

‎go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,8 @@ github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+
12231223
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
12241224
github.com/k0sproject/dig v0.4.0 h1:yBxFUUxNXAMGBg6b7c6ypxdx/o3RmhoI5v5ABOw5tn0=
12251225
github.com/k0sproject/dig v0.4.0/go.mod h1:rlZ7N7ZEcB4Fi96TPXkZ4dqyAiDWOGLapyL9YpZ7Qz4=
1226-
github.com/k0sproject/k0s v1.31.12-0.20250721135121-4b887bc48ed8 h1:y82CVoY/mcFpatuMRwzjC6wAxVy+t88pAbbEyjpVTf0=
1227-
github.com/k0sproject/k0s v1.31.12-0.20250721135121-4b887bc48ed8/go.mod h1:rxBtPCy2Bfc81c5mn5agePOYjl+jVZK3yYdUkPk1ZhY=
1226+
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf h1:SMMHKN8DGoieDgu5IaVWTV9mU310F0sz92Ar3UtpxkQ=
1227+
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf/go.mod h1:k/XY3WciqZwbC0LM3e+YxfC9Hg6JvwRMOP5Kd0kDLYM=
12281228
github.com/k0sproject/version v0.6.0 h1:Wi8wu9j+H36+okIQA47o/YHbzNpKeIYj8IjGdJOdqsI=
12291229
github.com/k0sproject/version v0.6.0/go.mod h1:5/7Js62gDCLBP6mEs0mUcYEEkYneM5qXDKN/hyFlQTM=
12301230
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -1387,8 +1387,10 @@ github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU
13871387
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
13881388
github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8=
13891389
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
1390-
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
1391-
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
1390+
github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
1391+
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
1392+
github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
1393+
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
13921394
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
13931395
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
13941396
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=

‎kinds/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.4
55
require (
66
github.com/google/uuid v1.6.0
77
github.com/k0sproject/dig v0.4.0
8-
github.com/k0sproject/k0s v1.31.12-0.20250721135121-4b887bc48ed8
8+
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf
99
github.com/stretchr/testify v1.10.0
1010
gopkg.in/yaml.v2 v2.4.0
1111
gopkg.in/yaml.v3 v3.0.1
@@ -36,7 +36,7 @@ require (
3636
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3737
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
3838
github.com/sirupsen/logrus v1.9.3 // indirect
39-
github.com/vishvananda/netlink v1.3.0 // indirect
39+
github.com/vishvananda/netlink v1.3.1-0.20250206174618-62fb240731fa // indirect
4040
github.com/vishvananda/netns v0.0.5 // indirect
4141
github.com/x448/float16 v0.8.4 // indirect
4242
go.yaml.in/yaml/v2 v2.4.2 // indirect

‎kinds/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
3434
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
3535
github.com/k0sproject/dig v0.4.0 h1:yBxFUUxNXAMGBg6b7c6ypxdx/o3RmhoI5v5ABOw5tn0=
3636
github.com/k0sproject/dig v0.4.0/go.mod h1:rlZ7N7ZEcB4Fi96TPXkZ4dqyAiDWOGLapyL9YpZ7Qz4=
37-
github.com/k0sproject/k0s v1.31.12-0.20250721135121-4b887bc48ed8 h1:y82CVoY/mcFpatuMRwzjC6wAxVy+t88pAbbEyjpVTf0=
38-
github.com/k0sproject/k0s v1.31.12-0.20250721135121-4b887bc48ed8/go.mod h1:rxBtPCy2Bfc81c5mn5agePOYjl+jVZK3yYdUkPk1ZhY=
37+
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf h1:SMMHKN8DGoieDgu5IaVWTV9mU310F0sz92Ar3UtpxkQ=
38+
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf/go.mod h1:k/XY3WciqZwbC0LM3e+YxfC9Hg6JvwRMOP5Kd0kDLYM=
3939
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
4040
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
4141
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -75,8 +75,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
7575
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
7676
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
7777
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
78-
github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
79-
github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
78+
github.com/vishvananda/netlink v1.3.1-0.20250206174618-62fb240731fa h1:iAhToRwOrdk+pKzclvLM7nKZhsg8f7dVrgkFccDUbUw=
79+
github.com/vishvananda/netlink v1.3.1-0.20250206174618-62fb240731fa/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
8080
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
8181
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
8282
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=

‎pkg/config/static/metadata.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ images:
99
calico-cni:
1010
repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni
1111
tag:
12-
amd64: v3.28.5-amd64@sha256:826858fd1d6ff8895c68a2de6ae1f2214a6ad45669cbdc264eb05bad73bd8bfa
13-
arm64: v3.28.5-arm64@sha256:a9b73fc06ccb3cc7283abe33248b965fa560ac7188230f4f0df12c0eea80df6e
12+
amd64: v3.29.3-amd64@sha256:9d051903680b28c8975e9be22576eb27db508ea21a3662377f490b41ca5df153
13+
arm64: v3.29.3-arm64@sha256:b867f0c417d148511e04a17e21979b585cd311a99783ad77cb1b0178db72009f
1414
calico-kube-controllers:
1515
repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers
1616
tag:
17-
amd64: v3.28.5-amd64@sha256:6b8fd4befcd1f7a88f56e8bfa8568ed76e6a74df7474ed8f78536cc26a18b33f
18-
arm64: v3.28.5-arm64@sha256:f58e9e353c1e98a96a5f32fd62efee947e472ef23d24130b37e561e5e34422ef
17+
amd64: v3.29.3-amd64@sha256:9214e9fe7b3cfdf9cf12b7696bf589b0516933118c7505f793491487a7afa6b6
18+
arm64: v3.29.3-arm64@sha256:e47422b5ccc5f840e2995f6390d97c6a40da8fe1ee83e93e8635171b0212af2c
1919
calico-node:
2020
repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node
2121
tag:
22-
amd64: v3.28.5-amd64@sha256:d0d1c42031b6984663826b1328d9994996e25f180e3b68b9346873340a7a3917
23-
arm64: v3.28.5-arm64@sha256:628b835b4f282a7c35e19af0545f2deb4443622d3aba6d9d43b26d79aaffcbfb
22+
amd64: v3.29.3-amd64@sha256:940a32296be9cdf61bb4c1b8805b3cf24b6b15c85bcbb329b451a4a1af1591ce
23+
arm64: v3.29.3-arm64@sha256:b5408bbbe15487400c4528fe94d0e7aa09ee4e29c28692ed30c4bce5f8688f02
2424
coredns:
2525
repo: proxy.replicated.com/anonymous/replicated/ec-coredns
2626
tag:
@@ -34,8 +34,8 @@ images:
3434
kube-proxy:
3535
repo: proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy
3636
tag:
37-
amd64: v1.31.12-amd64@sha256:4515f3f812757a1c3c607a275acf6491bda445a48c5dc110a412f9d51303a0a7
38-
arm64: v1.31.12-arm64@sha256:b4255f9b5275bfe30b44190292312b362147d935521f25b2249a42d57583156c
37+
amd64: v1.32.7-amd64@sha256:920bf8822c57fa47c712f3e504105809108aca2a9cdcdea16d63146710079075
38+
arm64: v1.32.7-arm64@sha256:644305c11e8e5f3d91c585ec66c047e3a0c60ba2bf802106412a42f378a33f4e
3939
metrics-server:
4040
repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server
4141
tag:

‎scripts/update-k0s-dep-version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function main() {
3131
make go.mod
3232

3333
make buildtools
34-
./output/bin/buildtools update images --image kube-proxy --image pause k0s
34+
./output/bin/buildtools update images --image kube-proxy --image pause --image calico-node --image calico-kube-controllers --image calico-cni k0s
3535

3636
make -C kinds generate
3737
make -C operator manifests

0 commit comments

Comments
 (0)