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

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

K0s 1.30 - DO NOT MERGE #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 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
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
4 changes: 3 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ linters:

# Our own extras:
- gofmt
- nolintlint # lints nolint directives
# We disable nolintlint on purpose given there's directives only applicable on latest which fail on previous release
# branches
# - nolintlint # lints nolint directives
# - revive

linters-settings:
Expand Down
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.31.8+k0s.0
K0S_GO_VERSION = v1.31.8+k0s.0
PREVIOUS_K0S_VERSION ?= v1.30.9+k0s.0
PREVIOUS_K0S_GO_VERSION ?= v1.30.9+k0s.0
K0S_VERSION = v1.30.9+k0s.0
K0S_GO_VERSION = v1.30.9+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.120.3

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 @@ -26,7 +26,7 @@ require (
github.com/gorilla/mux v1.8.1
github.com/gosimple/slug v1.15.0
github.com/jedib0t/go-pretty/v6 v6.6.7
github.com/k0sproject/k0s v1.31.9-0.20250428141639-26a9908cf691
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568
github.com/ohler55/ojg v1.26.8
github.com/onsi/ginkgo/v2 v2.23.4
github.com/onsi/gomega v1.37.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,8 +1236,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.31.9-0.20250428141639-26a9908cf691 h1:/w7R/XMauHygKj7I2Y1dLkPbmXTsxO1mCQxqomDIoMk=
github.com/k0sproject/k0s v1.31.9-0.20250428141639-26a9908cf691/go.mod h1:1aXYSUq/BOQvhIhjeQX9AQs2Yk/kthQh/E1r2rtMcCs=
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568 h1:JSfvTBrsNMWDISDUMVRZV6hP5eRusBS6d0Gv2lA4lSA=
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568/go.mod h1:Nmj+slwFht6ile7OHHGiSrcRRGmrA9U9PzjnG9/6gc0=
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
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 @@ -428,21 +423,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 @@ -170,21 +170,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"
},
"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"
},
"username": {
"description": "Username for Basic HTTP authentication.",
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/static/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ images:
kube-proxy:
repo: proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy
tag:
amd64: v1.31.9-amd64@sha256:a23b69e0843a51719cf652717bf3b2b1f29a635543e668cfec43d228f1e538f9
arm64: v1.31.9-arm64@sha256:40c69fe60d36ed579ad7363dcf095cdc57e041a4152ba96591243b11f74e7cd9
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 @@ -428,21 +423,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
Loading