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: diff --git a/Makefile b/Makefile index 01a72e6e22..de93c0f07a 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.120.3 diff --git a/go.mod b/go.mod index 22ffc4f9fd..3b515fb803 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 7f4957ad92..7d17768c00 100644 --- a/go.sum +++ b/go.sum @@ -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= 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 730a493b9d..8dfa33fdc5 100644 --- a/operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml +++ b/operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml @@ -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 @@ -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 diff --git a/operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml b/operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml index 0d8b335c43..d5eb227759 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 490262158e..c7bc2ce222 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 diff --git a/operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml b/operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml index bead7882c7..da248c554e 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/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.", 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.", diff --git a/pkg/config/static/metadata.yaml b/pkg/config/static/metadata.yaml index 1052aac806..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.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: diff --git a/pkg/crds/resources.yaml b/pkg/crds/resources.yaml index 730a493b9d..8dfa33fdc5 100644 --- a/pkg/crds/resources.yaml +++ b/pkg/crds/resources.yaml @@ -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 @@ -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