Skip to content
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.

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

K0s 1.29 - DO NOT MERGE #1363

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a14c153
pin k0s version to 1.29
emosbaugh Oct 22, 2024
430c1c8
chore(ci): re-promote 1.8.0 release each time (#1364)
emosbaugh Oct 22, 2024
2eb8fb7
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Oct 23, 2024
3788026
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Oct 23, 2024
8db725a
noop for new CI
laverya Oct 23, 2024
344667d
Update image versions
laverya Oct 23, 2024
6ee0b08
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Oct 23, 2024
1abe552
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Oct 23, 2024
8177660
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Oct 23, 2024
f24137d
Merge remote-tracking branch 'origin/main' into k0s-1-29
emosbaugh Oct 30, 2024
24ee05f
Merge remote-tracking branch 'origin/main' into k0s-1-29
emosbaugh Oct 31, 2024
7d5c69c
Merge remote-tracking branch 'origin/main' into k0s-1-29
emosbaugh Nov 4, 2024
b76e0b2
Trigger Build
emosbaugh Nov 4, 2024
0c96609
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 7, 2024
e2132ce
fix(ci): e2e test fails ntp preflight (#1469)
emosbaugh Nov 7, 2024
87f3258
fix(ci): collect fallback cluster support bundle in airgap (#1462)
emosbaugh Nov 7, 2024
8fd7f13
feat: update adminconsole version (#1471)
replicated-ci-ec Nov 7, 2024
f8cfdd1
Revert "feat: add preflight for ip forwarding" (#1470)
laverya Nov 7, 2024
8286a4e
Fix clock sync flakiness for docker-based clusters (#1472)
sgalsaleh Nov 8, 2024
0e1ee63
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 8, 2024
f977017
Merge remote-tracking branch 'origin/main' into k0s-1-29
emosbaugh Nov 8, 2024
852cc99
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 12, 2024
96b4cc8
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 14, 2024
09988e6
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 14, 2024
e7d762f
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 14, 2024
093d955
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 15, 2024
7f94395
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Nov 18, 2024
9556c9d
Merge remote-tracking branch 'origin/main' into k0s-1-29
sgalsaleh Dec 5, 2024
5c389b8
update kube-proxy image
sgalsaleh Dec 5, 2024
9b86583
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Jan 6, 2025
48cd7ae
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Jan 21, 2025
a7a5093
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Jan 21, 2025
eecc4d3
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Jan 24, 2025
6ac0107
k0s v1.29.13
laverya Jan 24, 2025
59c5fb2
Merge remote-tracking branch 'origin/main' into k0s-1-29
emosbaugh Jan 24, 2025
7254e49
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Feb 4, 2025
b6556b5
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Feb 5, 2025
b232c81
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Feb 5, 2025
6575758
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Feb 5, 2025
df16fab
merge main
sgalsaleh Feb 6, 2025
4322410
use 1.29.13 kube-proxy image
sgalsaleh Feb 6, 2025
b828b4f
Merge remote-tracking branch 'origin/main' into k0s-1-29
emosbaugh Feb 7, 2025
062976e
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Feb 7, 2025
240907a
Merge remote-tracking branch 'origin/main' into k0s-1-29
laverya Feb 7, 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
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.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_VERSION = v1.29.13+k0s.0
K0S_GO_VERSION = v1.29.13+k0s.0
PREVIOUS_K0S_VERSION ?= v1.28.14+k0s.0-ec.0
PREVIOUS_K0S_GO_VERSION ?= v1.28.14+k0s.0
K0S_BINARY_SOURCE_OVERRIDE =
TROUBLESHOOT_VERSION = v0.112.1

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require (
github.com/gosimple/slug v1.15.0
github.com/jedib0t/go-pretty/v6 v6.6.5
github.com/k0sproject/dig v0.4.0
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568
github.com/k0sproject/k0s v1.30.7-0.20241029184556-a942e759e13b
github.com/ohler55/ojg v1.26.1
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1205,8 +1205,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.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/k0s v1.30.7-0.20241029184556-a942e759e13b h1:pE04QpLnpve7c+bOn4GmKu/j3IMhVBAAjvK6z7mW+FM=
github.com/k0sproject/k0s v1.30.7-0.20241029184556-a942e759e13b/go.mod h1:j0xCfV9a+hwiOOr3HJmZb1enwXz8cdkSGDzDRqKSdG0=
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
4 changes: 2 additions & 2 deletions pkg/config/static/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ images:
kube-proxy:
repo: proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy
tag:
amd64: v1.30.9-amd64@sha256:33ed60b5deec65f44e346bc60a5d798462270e43145aa268b04d14a32ebe236c
arm64: v1.30.9-arm64@sha256:e5ebd7acab438f79d63cb1110778178a046da033092be49cbace82af15d394a3
amd64: v1.29.13-amd64@sha256:cc92e4bc6006899f0859d7e98c29188699096a12d2440f4ac0a987a7994b0e32
arm64: v1.29.13-arm64@sha256:48ba80e8f745adbc2282a29d1e7c6411c75db9f87345c5b664b8495de39bad76
metrics-server:
repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server
tag:
Expand Down
Loading