From 41893416a3e14c4ca02b186d00fb2c5d14d8b06a Mon Sep 17 00:00:00 2001 From: JGAntunes Date: Thu, 22 May 2025 14:49:11 +0100 Subject: [PATCH 1/9] Update k0s and image versions --- Makefile | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- pkg/config/static/metadata.yaml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index cb6ad9dbb7..756824fb55 100644 --- a/Makefile +++ b/Makefile @@ -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.119.0 diff --git a/go.mod b/go.mod index fef6b0ddfe..88a16f6663 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/google/uuid v1.6.0 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.3 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.37.0 diff --git a/go.sum b/go.sum index 94236587f8..a24604d2dd 100644 --- a/go.sum +++ b/go.sum @@ -1234,8 +1234,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= diff --git a/pkg/config/static/metadata.yaml b/pkg/config/static/metadata.yaml index 3182ea70f9..f36cdbea7a 100644 --- a/pkg/config/static/metadata.yaml +++ b/pkg/config/static/metadata.yaml @@ -34,8 +34,8 @@ images: kube-proxy: repo: proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy tag: - amd64: v1.31.8-amd64@sha256:cb8cf36b1cbf392b4f7386c219451582c235ec44a8c5093c451e1d7f21113809 - arm64: v1.31.8-arm64@sha256:412db0dffe3e0100ace58f94330b095a53408f9a06d7b063e2a6537cb32a8747 + amd64: v1.30.13-amd64@sha256:a51406d70d257d9747eaae0d470ae427a91c6920e4fd81f11295d943452f26d1 + arm64: v1.30.13-arm64@sha256:3abdc8c7b6a04e2b1516afe8916f09144125d190b3907f28d98819ae6f5c75dc metrics-server: repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server tag: @@ -44,5 +44,5 @@ images: pause: repo: proxy.replicated.com/anonymous/registry.k8s.io/pause tag: - amd64: 3.10-amd64@sha256:7c38f24774e3cbd906d2d33c38354ccf787635581c122965132c9bd309754d4a - arm64: 3.10-arm64@sha256:e50b7059b633caf3c1449b8da680d11845cda4506b513ee7a2de00725f0a34a7 + amd64: 3.9-amd64@sha256:8d4106c88ec0bd28001e34c975d65175d994072d65341f62a8ab0754b0fafe10 + arm64: 3.9-arm64@sha256:3ec98b8452dc8ae265a6917dfb81587ac78849e520d5dbba6de524851d20eca6 From 34a8c47a89b47380fd8725a88582ea18d16ded46 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Tue, 3 Jun 2025 11:01:16 -0700 Subject: [PATCH 2/9] operator crds --- .../charts/crds/templates/resources.yaml | 10 ---------- .../bases/embeddedcluster.replicated.com_configs.yaml | 5 ----- .../embeddedcluster.replicated.com_installations.yaml | 5 ----- 3 files changed, 20 deletions(-) diff --git a/operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml b/operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml index b8aec7b648..619dbb4737 100644 --- a/operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml +++ b/operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml @@ -104,21 +104,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 @@ -408,21 +403,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 diff --git a/operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml b/operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml index 5c3d3ab349..c3bb59e325 100644 --- a/operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml +++ b/operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml @@ -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 diff --git a/operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml b/operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml index 711eb679e6..0f470ba313 100644 --- a/operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml +++ b/operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml @@ -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 From ba7465214b30641d2ec22052116c7500d68d4578 Mon Sep 17 00:00:00 2001 From: Salah Aldeen Al Saleh Date: Tue, 3 Jun 2025 11:04:53 -0700 Subject: [PATCH 3/9] operator crds --- operator/schemas/config-embeddedcluster-v1beta1.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/operator/schemas/config-embeddedcluster-v1beta1.json b/operator/schemas/config-embeddedcluster-v1beta1.json index 3999d3577a..20de5bd3a7 100644 --- a/operator/schemas/config-embeddedcluster-v1beta1.json +++ b/operator/schemas/config-embeddedcluster-v1beta1.json @@ -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.", @@ -108,8 +104,7 @@ }, "name": { "description": "The repository name.", - "type": "string", - "minLength": 1 + "type": "string" }, "password": { "description": "Password for Basic HTTP authentication.", @@ -117,8 +112,7 @@ }, "url": { "description": "The repository URL.", - "type": "string", - "minLength": 1 + "type": "string" }, "username": { "description": "Username for Basic HTTP authentication.", From 91cf229c1bac1a06c272a0ecf30d38f7bbc7d383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Antunes?= Date: Thu, 5 Jun 2025 13:47:00 +0100 Subject: [PATCH 4/9] chore(lint): fix go lang ci lint for k0s-1-30 (#2248) chore(lint): fix go lang ci lint --- .golangci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 3aef90bae9..cb2d3591eb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -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: From 347bd8fb38fe38a24bc201dcf5a88328c544a793 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Mon, 30 Jun 2025 13:14:51 -0700 Subject: [PATCH 5/9] update crds --- ...cluster.replicated.com_kubernetesinstallations.yaml | 5 ----- pkg/crds/resources.yaml | 10 ---------- 2 files changed, 15 deletions(-) diff --git a/operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml b/operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml index 35a9a7db3c..44dc740bfe 100644 --- a/operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml +++ b/operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml @@ -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 diff --git a/pkg/crds/resources.yaml b/pkg/crds/resources.yaml index e8b53ae965..409e52d98c 100644 --- a/pkg/crds/resources.yaml +++ b/pkg/crds/resources.yaml @@ -104,21 +104,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 @@ -408,21 +403,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 From cca363a6699c1ecf1532c5a37cfb528eef623b68 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Mon, 30 Jun 2025 13:34:39 -0700 Subject: [PATCH 6/9] update crds --- ...kubernetesinstallation-embeddedcluster-v1beta1.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/operator/schemas/kubernetesinstallation-embeddedcluster-v1beta1.json b/operator/schemas/kubernetesinstallation-embeddedcluster-v1beta1.json index aa105b43ca..ae685812c9 100644 --- a/operator/schemas/kubernetesinstallation-embeddedcluster-v1beta1.json +++ b/operator/schemas/kubernetesinstallation-embeddedcluster-v1beta1.json @@ -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.", @@ -134,8 +130,7 @@ }, "name": { "description": "The repository name.", - "type": "string", - "minLength": 1 + "type": "string" }, "password": { "description": "Password for Basic HTTP authentication.", @@ -143,8 +138,7 @@ }, "url": { "description": "The repository URL.", - "type": "string", - "minLength": 1 + "type": "string" }, "username": { "description": "Username for Basic HTTP authentication.", From 01c8dbc20a9e88767b81070600634bc761337562 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Thu, 10 Jul 2025 16:11:40 -0700 Subject: [PATCH 7/9] upgrade kube proxy image --- pkg/config/static/metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/config/static/metadata.yaml b/pkg/config/static/metadata.yaml index 2aea93a4ca..b6dbb88367 100644 --- a/pkg/config/static/metadata.yaml +++ b/pkg/config/static/metadata.yaml @@ -34,8 +34,8 @@ images: kube-proxy: repo: proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy tag: - amd64: v1.30.13-amd64@sha256:a51406d70d257d9747eaae0d470ae427a91c6920e4fd81f11295d943452f26d1 - arm64: v1.30.13-arm64@sha256:3abdc8c7b6a04e2b1516afe8916f09144125d190b3907f28d98819ae6f5c75dc + 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: From 374962986210e905c3909f184a76e931dec67aa1 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Tue, 22 Jul 2025 11:49:09 -0700 Subject: [PATCH 8/9] make go mod --- kinds/go.mod | 3 ++- kinds/go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kinds/go.mod b/kinds/go.mod index 8ef10fd4bb..04d2de1a56 100644 --- a/kinds/go.mod +++ b/kinds/go.mod @@ -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.31.9-0.20250428141639-26a9908cf691 + github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568 github.com/stretchr/testify v1.10.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -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 diff --git a/kinds/go.sum b/kinds/go.sum index a2ea707371..a80caef087 100644 --- a/kinds/go.sum +++ b/kinds/go.sum @@ -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= @@ -32,8 +34,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.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/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= From 31441025c92291fe7a163e1f4a493e43a5f6ea97 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Tue, 22 Jul 2025 11:51:44 -0700 Subject: [PATCH 9/9] merge --- .golangci.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 7c798346fd..53e5fdd284 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,31 +6,6 @@ linters: - ineffassign - nolintlint - staticcheck -<<<<<<< HEAD - # - unused - - # Our own extras: - - gofmt - # 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: - govet: - # These govet checks are disabled by default, but they're useful. - enable: - - nilness - - reflectvaluecompare - - sortslice - - unusedwrite - unused: - field-writes-are-uses: false - exported-fields-are-used: false - # parameters-are-used: false - local-variables-are-used: false - -======= settings: govet: enable: @@ -48,7 +23,6 @@ linters-settings: - third_party$ - builtin$ - examples$ ->>>>>>> release-2.7.3+k8s-1.31 issues: max-issues-per-linter: 0 max-same-issues: 0