Skip to content

K0s 1.30 - DO NOT MERGE #2182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 23 commits into from
Closed

K0s 1.30 - DO NOT MERGE #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4189341
Update k0s and image versions
JGAntunes May 22, 2025
d0e2a7a
merge main
sgalsaleh Jun 3, 2025
34a8c47
operator crds
sgalsaleh Jun 3, 2025
ba74652
operator crds
sgalsaleh Jun 3, 2025
3f9d4dc
Merge remote-tracking branch 'origin/main' into k0s-1-30
sgalsaleh Jun 3, 2025
10fdd74
Merge remote-tracking branch 'origin/main' into k0s-1-30
sgalsaleh Jun 4, 2025
3297172
Merge remote-tracking branch 'origin/main' into k0s-1-30
sgalsaleh Jun 5, 2025
91cf229
chore(lint): fix go lang ci lint for k0s-1-30 (#2248)
JGAntunes Jun 5, 2025
9e34282
f
emosbaugh Jun 30, 2025
347bd8f
update crds
emosbaugh Jun 30, 2025
cca363a
update crds
emosbaugh Jun 30, 2025
00fec0c
Merge remote-tracking branch 'origin/main' into k0s-1-30
emosbaugh Jul 1, 2025
24eb456
Merge remote-tracking branch 'origin/main' into k0s-1-30
emosbaugh Jul 10, 2025
01c8dbc
upgrade kube proxy image
emosbaugh Jul 10, 2025
86fc2c0
Merge branch 'release-2.7.3+k8s-1.31' into k0s-1-30
emosbaugh Jul 22, 2025
3749629
make go mod
emosbaugh Jul 22, 2025
3144102
merge
emosbaugh Jul 22, 2025
50f2e2f
merge main
sgalsaleh Jul 29, 2025
a3da8fd
Merge commit '3992013d299a0e0006911dcc28336292a21f472e' into k0s-1-30
diamonwiggins Jul 31, 2025
89f7777
Merge remote-tracking branch 'origin/main' into k0s-1-30
emosbaugh Aug 5, 2025
abc058a
Merge remote-tracking branch 'origin/main' into k0s-1-30
emosbaugh Aug 8, 2025
5b95c0e
Merge remote-tracking branch 'origin/main' into k0s-1-30
emosbaugh Aug 11, 2025
c38e17e
merge main
sgalsaleh Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
ADMIN_CONSOLE_IMAGE_OVERRIDE =
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
K0S_VERSION = v1.32.7+k0s.0
K0S_GO_VERSION = v1.32.7+k0s.0
PREVIOUS_K0S_VERSION ?= v1.31.11+k0s.0
PREVIOUS_K0S_GO_VERSION ?= v1.31.11+k0s.0
K0S_VERSION = v1.30.14+k0s.0
K0S_GO_VERSION = v1.30.14+k0s.0
PREVIOUS_K0S_VERSION ?= v1.29.9+k0s.0-ec.0
PREVIOUS_K0S_GO_VERSION ?= v1.29.9+k0s.0
K0S_BINARY_SOURCE_OVERRIDE =
TROUBLESHOOT_VERSION = v0.121.2

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/gorilla/mux v1.8.1
github.com/gosimple/slug v1.15.0
github.com/jedib0t/go-pretty/v6 v6.6.8
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf
github.com/k0sproject/k0s v1.30.15-0.20250623150554-3fca8b5eb8e1
github.com/ohler55/ojg v1.26.8
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.38.0
Expand Down
10 changes: 4 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,8 +1223,8 @@ github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/k0sproject/dig v0.4.0 h1:yBxFUUxNXAMGBg6b7c6ypxdx/o3RmhoI5v5ABOw5tn0=
github.com/k0sproject/dig v0.4.0/go.mod h1:rlZ7N7ZEcB4Fi96TPXkZ4dqyAiDWOGLapyL9YpZ7Qz4=
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf h1:SMMHKN8DGoieDgu5IaVWTV9mU310F0sz92Ar3UtpxkQ=
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf/go.mod h1:k/XY3WciqZwbC0LM3e+YxfC9Hg6JvwRMOP5Kd0kDLYM=
github.com/k0sproject/k0s v1.30.15-0.20250623150554-3fca8b5eb8e1 h1:gsrbH+oZBs5LIy8CM/lXN1UWZttzjNpj2RGxDNUT3ng=
github.com/k0sproject/k0s v1.30.15-0.20250623150554-3fca8b5eb8e1/go.mod h1:6O9uhvQwq5ApV07z3jZKQS8BgqeQg23KWoka/DJ7/PU=
github.com/k0sproject/version v0.6.0 h1:Wi8wu9j+H36+okIQA47o/YHbzNpKeIYj8IjGdJOdqsI=
github.com/k0sproject/version v0.6.0/go.mod h1:5/7Js62gDCLBP6mEs0mUcYEEkYneM5qXDKN/hyFlQTM=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
Expand Down Expand Up @@ -1387,10 +1387,8 @@ github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8=
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
Expand Down
3 changes: 2 additions & 1 deletion kinds/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.24.4
require (
github.com/google/uuid v1.6.0
github.com/k0sproject/dig v0.4.0
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf
github.com/k0sproject/k0s v1.30.15-0.20250623150554-3fca8b5eb8e1
github.com/stretchr/testify v1.10.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -18,6 +18,7 @@ require (
require (
github.com/Masterminds/semver/v3 v3.3.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/containerd/containerd v1.7.27 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
Expand Down
6 changes: 4 additions & 2 deletions kinds/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7r
github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=
github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -34,8 +36,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/k0sproject/dig v0.4.0 h1:yBxFUUxNXAMGBg6b7c6ypxdx/o3RmhoI5v5ABOw5tn0=
github.com/k0sproject/dig v0.4.0/go.mod h1:rlZ7N7ZEcB4Fi96TPXkZ4dqyAiDWOGLapyL9YpZ7Qz4=
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf h1:SMMHKN8DGoieDgu5IaVWTV9mU310F0sz92Ar3UtpxkQ=
github.com/k0sproject/k0s v1.32.8-0.20250721135808-006eb13a92bf/go.mod h1:k/XY3WciqZwbC0LM3e+YxfC9Hg6JvwRMOP5Kd0kDLYM=
github.com/k0sproject/k0s v1.30.15-0.20250623150554-3fca8b5eb8e1 h1:gsrbH+oZBs5LIy8CM/lXN1UWZttzjNpj2RGxDNUT3ng=
github.com/k0sproject/k0s v1.30.15-0.20250623150554-3fca8b5eb8e1/go.mod h1:6O9uhvQwq5ApV07z3jZKQS8BgqeQg23KWoka/DJ7/PU=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
Expand Down
10 changes: 0 additions & 10 deletions operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down Expand Up @@ -433,21 +428,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down
5 changes: 0 additions & 5 deletions operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down
5 changes: 0 additions & 5 deletions operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down
5 changes: 0 additions & 5 deletions operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down
10 changes: 2 additions & 8 deletions operator/schemas/config-embeddedcluster-v1beta1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@
"items": {
"description": "Repository describes single repository entry. Fields map to the CLI flags for the \"helm add\" command",
"type": "object",
"required": [
"name",
"url"
],
"properties": {
"caFile": {
"description": "CA bundle file to use when verifying HTTPS-enabled servers.",
Expand All @@ -108,17 +104,15 @@
},
"name": {
"description": "The repository name.",
"type": "string",
"minLength": 1
"type": "string"
},
"password": {
"description": "Password for Basic HTTP authentication.",
"type": "string"
},
"url": {
"description": "The repository URL.",
"type": "string",
"minLength": 1
"type": "string"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Helm Repository Validation Bypass

Removing required and minLength: 1 validation for Helm repository name and url fields allows empty or missing values. This will lead to runtime failures when the system attempts to use or add these repositories.

Additional Locations (3)
Fix in Cursor Fix in Web

},
"username": {
"description": "Username for Basic HTTP authentication.",
Expand Down
10 changes: 2 additions & 8 deletions operator/schemas/kubernetesinstallation-embeddedcluster-v1beta1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@
"items": {
"description": "Repository describes single repository entry. Fields map to the CLI flags for the \"helm add\" command",
"type": "object",
"required": [
"name",
"url"
],
"properties": {
"caFile": {
"description": "CA bundle file to use when verifying HTTPS-enabled servers.",
Expand All @@ -134,17 +130,15 @@
},
"name": {
"description": "The repository name.",
"type": "string",
"minLength": 1
"type": "string"
},
"password": {
"description": "Password for Basic HTTP authentication.",
"type": "string"
},
"url": {
"description": "The repository URL.",
"type": "string",
"minLength": 1
"type": "string"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Helm Repo Validation Constraints Removed

Critical validation constraints for Helm repository configurations were removed. The minLength: 1 validation for name and url fields, and the required: ["name", "url"] constraint were deleted. This allows invalid Helm repositories with empty or missing names and URLs to be configured, which will cause runtime failures when the system attempts to use them.

Locations (5)
Fix in Cursor Fix in Web

},
"username": {
"description": "Username for Basic HTTP authentication.",
Expand Down
16 changes: 8 additions & 8 deletions pkg/config/static/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ images:
calico-cni:
repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni
tag:
amd64: v3.29.3-amd64@sha256:9d051903680b28c8975e9be22576eb27db508ea21a3662377f490b41ca5df153
arm64: v3.29.3-arm64@sha256:b867f0c417d148511e04a17e21979b585cd311a99783ad77cb1b0178db72009f
amd64: v3.28.5-amd64@sha256:a79595aafcfc35d2f3ee2f06526f7dd7152c31ebb83206298f352dd5448ea8d1
arm64: v3.28.5-arm64@sha256:1ff48a63eed799cc4e1068d6e1e982fc5827552dfd5a9e0e97d0e95f6046eeb4
calico-kube-controllers:
repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers
tag:
amd64: v3.29.3-amd64@sha256:9214e9fe7b3cfdf9cf12b7696bf589b0516933118c7505f793491487a7afa6b6
arm64: v3.29.3-arm64@sha256:e47422b5ccc5f840e2995f6390d97c6a40da8fe1ee83e93e8635171b0212af2c
amd64: v3.28.5-amd64@sha256:724e17f2a6c987cd6d3a684834dbd8599f8d7985add0c761e1970bf34d75543c
arm64: v3.28.5-arm64@sha256:0c3ce120674e4d5695ed1967c553148f12315cba73b590da5eb56c79b7b31f69
calico-node:
repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node
tag:
amd64: v3.29.3-amd64@sha256:940a32296be9cdf61bb4c1b8805b3cf24b6b15c85bcbb329b451a4a1af1591ce
arm64: v3.29.3-arm64@sha256:b5408bbbe15487400c4528fe94d0e7aa09ee4e29c28692ed30c4bce5f8688f02
amd64: v3.28.5-amd64@sha256:9153cb273b0a8784f3016fb65f92768bde3e9abbdc2b9ba37cdd74e0d417e7f6
arm64: v3.28.5-arm64@sha256:7ab2e4d0b3bc2063628095abccdd7cfcc8a4c8605c492e8cb5d5ee515aaed7f8
coredns:
repo: proxy.replicated.com/anonymous/replicated/ec-coredns
tag:
Expand All @@ -34,8 +34,8 @@ images:
kube-proxy:
repo: proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy
tag:
amd64: v1.32.7-amd64@sha256:920bf8822c57fa47c712f3e504105809108aca2a9cdcdea16d63146710079075
arm64: v1.32.7-arm64@sha256:644305c11e8e5f3d91c585ec66c047e3a0c60ba2bf802106412a42f378a33f4e
amd64: v1.30.14-amd64@sha256:d0fbd4d84c29923f8830fa556a9bb623e5e119efccca1198da72b2f3d42227e6
arm64: v1.30.14-arm64@sha256:6c9debf74f7ded6ba1641ce6ea0f891968c28a73fe8b955ceb269c44ad771722
metrics-server:
repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server
tag:
Expand Down
10 changes: 0 additions & 10 deletions pkg/crds/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down Expand Up @@ -433,21 +428,16 @@ spec:
type: string
name:
description: The repository name.
minLength: 1
type: string
password:
description: Password for Basic HTTP authentication.
type: string
url:
description: The repository URL.
minLength: 1
type: string
username:
description: Username for Basic HTTP authentication.
type: string
required:
- name
- url
type: object
type: array
type: object
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/.k0s/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHELL := /bin/bash
DEBUG ?=
RUN ?=

K0S_VERSION ?= v1.30.9+k0s.0
K0S_VERSION ?= v1.30.14+k0s.0

GO_BUILD_TAGS ?= containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper,exclude_graphdriver_overlay

Expand Down
Loading