From 400a83f27568dec470c5376e0ccd4b7a96d59803 Mon Sep 17 00:00:00 2001 From: Christoph Mewes Date: Mon, 29 Apr 2024 12:29:42 +0200 Subject: [PATCH] [release/v2.25] prepare v2.25.2 (#6674) --- Makefile | 2 +- modules/api/Makefile | 2 +- modules/api/go.mod | 4 ++-- modules/api/go.sum | 8 ++++---- modules/web/Makefile | 2 +- modules/web/package-lock.json | 4 ++-- modules/web/package.json | 2 +- modules/web/src/assets/config/changelog.json | 18 +++++------------- 8 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 1ac8c34e28..ce66b1d6e8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.1 +KUBERMATIC_VERSION?=v2.25.2 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 7838fb055c..a8845a363a 100644 --- a/modules/api/Makefile +++ b/modules/api/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.1 +KUBERMATIC_VERSION?=v2.25.2 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/go.mod b/modules/api/go.mod index d5058fc7cb..d86bc52021 100644 --- a/modules/api/go.mod +++ b/modules/api/go.mod @@ -49,7 +49,7 @@ require ( github.com/gorilla/securecookie v1.1.2 github.com/gorilla/websocket v1.5.1 github.com/hetznercloud/hcloud-go v1.53.0 - github.com/kubermatic/machine-controller v1.59.0 + github.com/kubermatic/machine-controller v1.59.1 github.com/minio/minio-go/v7 v7.0.66 github.com/onsi/ginkgo v1.16.5 github.com/open-policy-agent/frameworks/constraint v0.0.0-20240206175643-9de2e6ab07f8 // v0.9.0+ @@ -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.1-0.20240417084102-89f399c42c26 + k8c.io/kubermatic/v2 v2.25.2-0.20240429090042-ab1aed7a6539 k8c.io/operating-system-manager v1.5.0 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 e9aa0f6cef..d69bcc384c 100644 --- a/modules/api/go.sum +++ b/modules/api/go.sum @@ -598,8 +598,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubermatic/machine-controller v1.59.0 h1:hE2DG4i1Hpig+lqyFKffffJE7+exHlfBHrs41J/mRe0= -github.com/kubermatic/machine-controller v1.59.0/go.mod h1:HYulildntbPjGd+iCngysmUdOXC3vAxmcoyJV2oZiaw= +github.com/kubermatic/machine-controller v1.59.1 h1:pbIz5IS9KoYtHIjQaOxWuToxFpYaEdJT1zS8Pw+QcH8= +github.com/kubermatic/machine-controller v1.59.1/go.mod h1:HYulildntbPjGd+iCngysmUdOXC3vAxmcoyJV2oZiaw= github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyPlUHk/ofpgvBcNcawJLtf4PYHORLjAA= github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= @@ -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.1-0.20240417084102-89f399c42c26 h1:HflIAJuUdlVSIJtetDWN6ZAU7GZBqQKKHoOWOLyUqBY= -k8c.io/kubermatic/v2 v2.25.1-0.20240417084102-89f399c42c26/go.mod h1:dmFyeWNX+/fEwMPHjq8EqRev3F+BXn7zLzZzKqV0bH0= +k8c.io/kubermatic/v2 v2.25.2-0.20240429090042-ab1aed7a6539 h1:a81DjkH39/MKtMnXpdcOIxhxsiq6K1p0tM+L7HOJuhM= +k8c.io/kubermatic/v2 v2.25.2-0.20240429090042-ab1aed7a6539/go.mod h1:JJqPgpKmQn+OdnuhtGTp+fT8/9wxcFp7srvg7x4wZ0o= k8c.io/operating-system-manager v1.5.0 h1:XgdDhnHoGcP4xKFdSsPahFVaBuZqb5sr3+mQe6RW7Dc= k8c.io/operating-system-manager v1.5.0/go.mod h1:h7gVySBkNOVDj2LAW90kDw2nwAROS5k9wVHeK6w/1KQ= k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak= diff --git a/modules/web/Makefile b/modules/web/Makefile index 40547fdffa..4fb527d6c9 100644 --- a/modules/web/Makefile +++ b/modules/web/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.1 +KUBERMATIC_VERSION?=v2.25.2 CC=npm GOOS ?= $(shell go env GOOS) export GOOS diff --git a/modules/web/package-lock.json b/modules/web/package-lock.json index a9c6e3a4bf..250d594ff8 100644 --- a/modules/web/package-lock.json +++ b/modules/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "kubermatic-dashboard", - "version": "2.25.1", + "version": "2.25.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kubermatic-dashboard", - "version": "2.25.1", + "version": "2.25.2", "hasInstallScript": true, "license": "proprietary", "dependencies": { diff --git a/modules/web/package.json b/modules/web/package.json index 4fd92f72b0..55b327f631 100644 --- a/modules/web/package.json +++ b/modules/web/package.json @@ -1,7 +1,7 @@ { "name": "kubermatic-dashboard", "description": "Kubermatic Dashboard", - "version": "2.25.1", + "version": "2.25.2", "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 db17af5294..935dd63496 100644 --- a/modules/web/src/assets/config/changelog.json +++ b/modules/web/src/assets/config/changelog.json @@ -1,29 +1,21 @@ { - "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2251", + "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2252", "entries": [ - { - "category": "added", - "description": "Add support for Kubernetes 1.27.13, 1.28.9 and 1.29.4 (fixes CVE-2024-3177)." - }, { "category": "fixed", - "description": "Fix `csi` Addon not applying cleanly on Azure user clusters that were created with KKP <= 2.24" + "description": "Fix template value for MachineDeployments in edit mode" }, { "category": "fixed", - "description": "Cluster-autoscaler addon now works based on the namespace instead of cluster names; all MachineDeployments in the `kube-system` namespace are scaled." + "description": "Hotfix to mitigate a bug in new releases of Chromium that causes browser crashes on `mat-select` component" }, { "category": "fixed", - "description": "Add Canal CNI version v3.27.3, having a fix to the ipset incompatibility bug." + "description": "vSphere: fix anti-affinity DRS configuration for VMs" }, { "category": "fixed", - "description": "Resolve conflict in determining available Kubernetes versions where upgrades where possible in `Cluster` object but not via the Dashboard." - }, - { - "category": "security", - "description": "Update Cilium to 1.14.9 and 1.13.14, mitigating CVE-2024-28860 and CVE-2024-28248." + "description": "Fix Azure CCM not being reconciled because of labelling changes" } ] }