From 2e71e07d58a22199e2b43518f46d058277cfc6c1 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Tue, 15 Oct 2024 15:27:25 -0700 Subject: [PATCH 1/2] feat: k0s 1.30.5 --- Makefile | 10 ++++++---- go.mod | 4 +++- go.sum | 10 ++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b0976377a..d7ec53ea5 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,9 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE = ADMIN_CONSOLE_IMAGE_OVERRIDE = ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE = ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE = -K0S_VERSION = v1.29.9+k0s.0-ec.0 -K0S_GO_VERSION = v1.29.9+k0s.0 -PREVIOUS_K0S_VERSION ?= v1.28.14+k0s.0-ec.0 +K0S_VERSION = v1.30.5+k0s.0-ec.0 +K0S_GO_VERSION = v1.30.5+k0s.0 +PREVIOUS_K0S_VERSION ?= v1.29.9+k0s.0-ec.0 K0S_BINARY_SOURCE_OVERRIDE = TROUBLESHOOT_VERSION = v0.105.2 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/') @@ -26,7 +26,9 @@ METADATA_K0S_BINARY_URL_OVERRIDE = METADATA_KOTS_BINARY_URL_OVERRIDE = METADATA_OPERATOR_BINARY_URL_OVERRIDE = -ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0) +ifeq ($(K0S_VERSION),v1.30.5+k0s.0-ec.0) +K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.30.5%2Bk0s.0-ec.0-$(ARCH) +else ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0) K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.29.9%2Bk0s.0-ec.0-$(ARCH) else ifeq ($(K0S_VERSION),v1.28.14+k0s.0-ec.0) K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.28.14%2Bk0s.0-ec.0-$(ARCH) diff --git a/go.mod b/go.mod index 5db935f10..a30a6a3a8 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/gosimple/slug v1.14.0 github.com/jedib0t/go-pretty/v6 v6.6.0 github.com/k0sproject/dig v0.2.0 - github.com/k0sproject/k0s v1.29.10-0.20240930110610-443e28b75d21 + github.com/k0sproject/k0s v1.30.6-0.20240930094415-0fb1b4751cf8 github.com/k0sproject/version v0.6.0 github.com/ohler55/ojg v1.24.1 github.com/onsi/ginkgo/v2 v2.20.2 @@ -163,6 +163,8 @@ require ( github.com/spf13/cast v1.7.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect + github.com/vishvananda/netlink v1.3.0 // indirect + github.com/vishvananda/netns v0.0.4 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect diff --git a/go.sum b/go.sum index fda111e3f..f395eaa73 100644 --- a/go.sum +++ b/go.sum @@ -302,8 +302,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/k0sproject/dig v0.2.0 h1:cNxEIl96g9kqSMfPSZLhpnZ0P8bWXKv08nxvsMHop5w= github.com/k0sproject/dig v0.2.0/go.mod h1:rBcqaQlJpcKdt2x/OE/lPvhGU50u/e95CSm5g/r4s78= -github.com/k0sproject/k0s v1.29.10-0.20240930110610-443e28b75d21 h1:EJE9ih7zGBPrAF5fclbBBWcNr33rQCV2EqtNkLItErw= -github.com/k0sproject/k0s v1.29.10-0.20240930110610-443e28b75d21/go.mod h1:gMY/YiwqJXxUg5SDStFGe/E8Je8P81Gyq9W0kj1t0/I= +github.com/k0sproject/k0s v1.30.6-0.20240930094415-0fb1b4751cf8 h1:+AMk8Wz6JLsg1z9mWTRdWdN+pRGINa5IHjwfoMujW8s= +github.com/k0sproject/k0s v1.30.6-0.20240930094415-0fb1b4751cf8/go.mod h1:mKWZFeX0hOKzGF1lr3iJmgM9SD+ZwhjiR2gakA62SdM= 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= @@ -512,6 +512,10 @@ github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8= github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ= github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= +github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= +github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= +github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= +github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vmware-tanzu/velero v1.14.1 h1:HYj73scn7ZqtfTanjW/X4W0Hn3w/qcfoRbrHCWM52iI= github.com/vmware-tanzu/velero v1.14.1/go.mod h1:/OzHzTvbevkkX+bK/BS4AgYMv6nKuOgsybuuvLWkSS0= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= @@ -638,7 +642,9 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= From 4a3899d110996f0547a4e4a3b754e1c78a8c4365 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Wed, 16 Oct 2024 13:50:29 -0700 Subject: [PATCH 2/2] fix --- .github/workflows/ci.yaml | 1 + Makefile | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ff8b63707..7744fee47 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -211,6 +211,7 @@ jobs: MANGLE_METADATA: "1" run: | export K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) + export K0S_GO_VERSION=$(make print-PREVIOUS_K0S_GO_VERSION) export EC_VERSION=$(git describe --tags --match='[0-9]*.[0-9]*.[0-9]*')-previous-k0s export APP_VERSION=appver-dev-${{ needs.git-sha.outputs.git_sha }}-previous-k0s diff --git a/Makefile b/Makefile index d7ec53ea5..72b673d17 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +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.5+k0s.0-ec.0 +K0S_VERSION = v1.30.5+k0s.0 K0S_GO_VERSION = v1.30.5+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.105.2 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/') @@ -26,9 +27,7 @@ METADATA_K0S_BINARY_URL_OVERRIDE = METADATA_KOTS_BINARY_URL_OVERRIDE = METADATA_OPERATOR_BINARY_URL_OVERRIDE = -ifeq ($(K0S_VERSION),v1.30.5+k0s.0-ec.0) -K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.30.5%2Bk0s.0-ec.0-$(ARCH) -else ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0) +ifeq ($(K0S_VERSION),v1.29.9+k0s.0-ec.0) K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.29.9%2Bk0s.0-ec.0-$(ARCH) else ifeq ($(K0S_VERSION),v1.28.14+k0s.0-ec.0) K0S_BINARY_SOURCE_OVERRIDE = https://tf-staging-embedded-cluster-bin.s3.amazonaws.com/custom-k0s-binaries/k0s-v1.28.14%2Bk0s.0-ec.0-$(ARCH)