update to k0s 1.30.6 (#1498)

* update to k0s 1.30.6 upstream * remove patch files that have been included upstream
replicatedhq · Nov 14, 2024 · ae6878e · ae6878e
1 parent 0bc1fd7
commit ae6878e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 134 deletions.
diff --git a/Makefile b/Makefile
@@ -10,8 +10,8 @@ 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.1
-K0S_GO_VERSION = v1.30.5+k0s.0
+K0S_VERSION = v1.30.6+k0s.0
+K0S_GO_VERSION = v1.30.6+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 =

diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/gosimple/slug v1.14.0
 	github.com/jedib0t/go-pretty/v6 v6.6.1
 	github.com/k0sproject/dig v0.2.0
-	github.com/k0sproject/k0s v1.30.6-0.20240930094415-0fb1b4751cf8
+	github.com/k0sproject/k0s v1.30.7-0.20241029184556-a942e759e13b
 	github.com/ohler55/ojg v1.25.0
 	github.com/onsi/ginkgo/v2 v2.21.0
 	github.com/onsi/gomega v1.35.1

diff --git a/go.sum b/go.sum
@@ -699,8 +699,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 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.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/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=

diff --git a/k0s-patches/release-1.29/0001-fix-chart-crd-forceUpgrade-field-should-be-nil-by-de.patch b/k0s-patches/release-1.29/0001-fix-chart-crd-forceUpgrade-field-should-be-nil-by-de.patch
diff --git a/k0s-patches/release-1.30/0001-fix-chart-crd-forceUpgrade-field-should-be-nil-by-de.patch b/k0s-patches/release-1.30/0001-fix-chart-crd-forceUpgrade-field-should-be-nil-by-de.patch