From 11e3ebd4a181e4bdd84d1c6a8f0674191f3fe6d3 Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Tue, 17 Sep 2024 20:26:44 +0200 Subject: [PATCH] [release/v2.25] prepare 2.25.9 (#6852) * [release/v2.25] prepare 2.25.9 * [release/v2.25] codegen * [release/v2.25] update changelog --- Makefile | 2 +- modules/api/Makefile | 2 +- modules/api/cmd/kubermatic-api/swagger.json | 10 ++++++++++ modules/api/go.mod | 2 +- modules/api/go.sum | 4 ++-- .../apiclient/models/datacenter_spec_openstack.go | 8 ++++++++ modules/web/Makefile | 2 +- modules/web/package-lock.json | 4 ++-- modules/web/package.json | 2 +- modules/web/src/assets/config/changelog.json | 12 ++++++++++-- 10 files changed, 37 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 78be7e7f41..4329c81e70 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.8 +KUBERMATIC_VERSION?=v2.25.9 DOCKER_REPO ?= quay.io/kubermatic REPO = $(DOCKER_REPO)/dashboard$(shell [[ "$(KUBERMATIC_EDITION)" != "ce" ]] && printf -- '-%s' ${KUBERMATIC_EDITION}) IMAGE_TAG=$(shell echo $$(git rev-parse HEAD)|tr -d '\n') diff --git a/modules/api/Makefile b/modules/api/Makefile index cdaf9ef2d5..c179814021 100644 --- a/modules/api/Makefile +++ b/modules/api/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.8 +KUBERMATIC_VERSION?=v2.25.9 DOCKER_REPO ?= quay.io/kubermatic REPO = $(DOCKER_REPO)/dashboard$(shell [[ "$(KUBERMATIC_EDITION)" != "ce" ]] && printf -- '-%s' ${KUBERMATIC_EDITION}) IMAGE_TAG=$(shell echo $$(git rev-parse HEAD)|tr -d '\n') diff --git a/modules/api/cmd/kubermatic-api/swagger.json b/modules/api/cmd/kubermatic-api/swagger.json index 4c37eef9a6..a2e55582f9 100644 --- a/modules/api/cmd/kubermatic-api/swagger.json +++ b/modules/api/cmd/kubermatic-api/swagger.json @@ -29947,6 +29947,16 @@ "type": "boolean", "x-go-name": "IPv6Enabled" }, + "loadBalancerMethod": { + "description": "Optional: Gets mapped to the \"lb-method\" setting in the cloud config.\ndefaults to \"ROUND_ROBIN\".", + "type": "string", + "x-go-name": "LoadBalancerMethod" + }, + "loadBalancerProvider": { + "description": "Optional: Gets mapped to the \"lb-provider\" setting in the cloud config.\ndefaults to \"\"", + "type": "string", + "x-go-name": "LoadBalancerProvider" + }, "manageSecurityGroups": { "description": "Optional: Gets mapped to the \"manage-security-groups\" setting in the cloud config.\nThis setting defaults to true.", "type": "boolean", diff --git a/modules/api/go.mod b/modules/api/go.mod index 0cc3a60bd6..6e74e30645 100644 --- a/modules/api/go.mod +++ b/modules/api/go.mod @@ -70,7 +70,7 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/yaml.v3 v3.0.1 k8c.io/kubeone v1.7.2 - k8c.io/kubermatic/v2 v2.25.8-0.20240820122910-32981714eb22 + k8c.io/kubermatic/v2 v2.25.9-0.20240914092535-5213dd6f6caa k8c.io/operating-system-manager v1.5.2 k8c.io/reconciler v0.5.0 k8s.io/api v0.29.1 diff --git a/modules/api/go.sum b/modules/api/go.sum index b62411a466..82e50553ee 100644 --- a/modules/api/go.sum +++ b/modules/api/go.sum @@ -1421,8 +1421,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8c.io/kubeone v1.7.2 h1:uLH19VEp1S5j4f3UwQP4CLHErJ23UiJM2MnbufNWDgI= k8c.io/kubeone v1.7.2/go.mod h1:9v2VFz/+l36cW65kd5YufEYHunbKlJ6P8SBakj05xgM= -k8c.io/kubermatic/v2 v2.25.8-0.20240820122910-32981714eb22 h1:dKkyOejjAYFJOiqQCKYfzjpoFDS7hyyFtzkK3+iHJ9M= -k8c.io/kubermatic/v2 v2.25.8-0.20240820122910-32981714eb22/go.mod h1:lW37Zy4mClvBX/h6qzhIKFlbiE5GqPJvar2z7UgQQMw= +k8c.io/kubermatic/v2 v2.25.9-0.20240914092535-5213dd6f6caa h1:+PqmwLS2jsJnjYmovzEIImKCEbDe4FX8jRnm4kKNUWg= +k8c.io/kubermatic/v2 v2.25.9-0.20240914092535-5213dd6f6caa/go.mod h1:lW37Zy4mClvBX/h6qzhIKFlbiE5GqPJvar2z7UgQQMw= k8c.io/operating-system-manager v1.5.2 h1:zzRAGytDUNFlegQW31kUE3dc6tVzAdqZ6IxrbDFugOI= k8c.io/operating-system-manager v1.5.2/go.mod h1:h7gVySBkNOVDj2LAW90kDw2nwAROS5k9wVHeK6w/1KQ= k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak= diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go b/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go index 72a4cd3f34..e14f44a643 100644 --- a/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go +++ b/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go @@ -43,6 +43,14 @@ type DatacenterSpecOpenstack struct { // Optional IgnoreVolumeAZ bool `json:"ignoreVolumeAZ,omitempty"` + // Optional: Gets mapped to the "lb-method" setting in the cloud config. + // defaults to "ROUND_ROBIN". + LoadBalancerMethod string `json:"loadBalancerMethod,omitempty"` + + // Optional: Gets mapped to the "lb-provider" setting in the cloud config. + // defaults to "" + LoadBalancerProvider string `json:"loadBalancerProvider,omitempty"` + // Optional: Gets mapped to the "manage-security-groups" setting in the cloud config. // This setting defaults to true. ManageSecurityGroups bool `json:"manageSecurityGroups,omitempty"` diff --git a/modules/web/Makefile b/modules/web/Makefile index 08fcdf02cf..32d9ae3709 100644 --- a/modules/web/Makefile +++ b/modules/web/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.8 +KUBERMATIC_VERSION?=v2.25.9 CC=npm GOOS ?= $(shell go env GOOS) export GOOS diff --git a/modules/web/package-lock.json b/modules/web/package-lock.json index c9a6e22341..b2367d31f3 100644 --- a/modules/web/package-lock.json +++ b/modules/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "kubermatic-dashboard", - "version": "2.25.8", + "version": "2.25.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kubermatic-dashboard", - "version": "2.25.8", + "version": "2.25.9", "hasInstallScript": true, "license": "proprietary", "dependencies": { diff --git a/modules/web/package.json b/modules/web/package.json index 47975a2b0f..4df2cd143d 100644 --- a/modules/web/package.json +++ b/modules/web/package.json @@ -1,7 +1,7 @@ { "name": "kubermatic-dashboard", "description": "Kubermatic Dashboard", - "version": "2.25.8", + "version": "2.25.9", "type": "module", "license": "proprietary", "repository": "https://github.com/kubermatic/dashboard", diff --git a/modules/web/src/assets/config/changelog.json b/modules/web/src/assets/config/changelog.json index 8ba1eed26a..75663029cb 100644 --- a/modules/web/src/assets/config/changelog.json +++ b/modules/web/src/assets/config/changelog.json @@ -1,9 +1,17 @@ { - "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2258", + "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2259", "entries": [ { "category": "fixed", - "description": "Fix TLS errors in the admin page when using a custom CA for the metering object store" + "description": "Fix vSphere degradation because of missing CCM/CSI container images" + }, + { + "category": "fixed", + "description": "Fix an issue where the cursor in the web terminal kept jumping to the beginning due to a sizing issue" + }, + { + "category": "fixed", + "description": "When deleting a cluster, the Kubevirt provider waits for the etcd backups to get deleted before removing the namespace" } ] }