[release/v2.24]Bump version changes for KKP Apr 2024 patch release (#…

…6653) * [release/v2.24]Bump version changes for KKP Apr 2024 patch release Signed-off-by: archups <archupsawant@gmail.com> * Fixed api-unit test failure Signed-off-by: archups <archupsawant@gmail.com> * Fixed api-unit test failure Signed-off-by: archups <archupsawant@gmail.com> * Refresh bump version changes Signed-off-by: archups <archupsawant@gmail.com> * Add release notes Signed-off-by: archups <archupsawant@gmail.com> --------- Signed-off-by: archups <archupsawant@gmail.com>
kubermatic · Apr 18, 2024 · 08f4d45 · 08f4d45
1 parent d6cd200
commit 08f4d45
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.24.5
+KUBERMATIC_VERSION?=v2.24.6
 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
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.24.5
+KUBERMATIC_VERSION?=v2.24.6
 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
@@ -67,7 +67,7 @@ require (
 	gopkg.in/square/go-jose.v2 v2.6.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8c.io/kubeone v1.7.0
-	k8c.io/kubermatic/v2 v2.24.6-0.20240412102035-07cf4889885b
+	k8c.io/kubermatic/v2 v2.24.6-0.20240417082402-056b0811caff
 	k8c.io/operating-system-manager v1.4.1
 	k8c.io/reconciler v0.4.0
 	k8s.io/api v0.28.2

diff --git a/modules/api/go.sum b/modules/api/go.sum
@@ -1425,8 +1425,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.0 h1:HDUHcGZWw8v2cN1KWmeUfXVquppqlQLmDgMZdWfg1hA=
 k8c.io/kubeone v1.7.0/go.mod h1:v/rybawEit3+HXPOtHyFyww0laqGzcxL0EJmdiJqQNo=
-k8c.io/kubermatic/v2 v2.24.6-0.20240412102035-07cf4889885b h1:dbg5lGQ3XJ7kmvHN17bKiZIrOjliGJ11bL+GXcOA3/s=
-k8c.io/kubermatic/v2 v2.24.6-0.20240412102035-07cf4889885b/go.mod h1:PUzG0zBBA4BArWSonWFAJLyhGsEJdeK9KtbXT2kADTI=
+k8c.io/kubermatic/v2 v2.24.6-0.20240417082402-056b0811caff h1:fznLPmO7fPwKcHQTlJN3F6BVuqN3X3N9Dyha6DnW3rU=
+k8c.io/kubermatic/v2 v2.24.6-0.20240417082402-056b0811caff/go.mod h1:PUzG0zBBA4BArWSonWFAJLyhGsEJdeK9KtbXT2kADTI=
 k8c.io/operating-system-manager v1.4.1 h1:hUL6YA1h2i0IpiobohsQuIbsz7vDRNsKGEZuO/loPpo=
 k8c.io/operating-system-manager v1.4.1/go.mod h1:4buJRqOn406AYiQ7FGs4tXaySgb6Ro6Hffp6gu6FHY8=
 k8c.io/reconciler v0.4.0 h1:movw1R8Q0/JC8S+d6eq9si5PvLFbX3A0x8yaDlxuFn4=

diff --git a/modules/web/Makefile b/modules/web/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.24.5
+KUBERMATIC_VERSION?=v2.24.6
 CC=npm
 GOOS ?= $(shell go env GOOS)
 export GOOS

diff --git a/modules/web/package-lock.json b/modules/web/package-lock.json
diff --git a/modules/web/package.json b/modules/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "kubermatic-dashboard",
   "description": "Kubermatic Dashboard",
-  "version": "2.24.5",
+  "version": "2.24.6",
   "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
@@ -1,4 +1,13 @@
 {
-  "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.24.md#v2245",
-  "entries": []
+  "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.24.md#v2246",
+  "entries": [
+    {
+      "category": "added",
+      "description": "Add support for Kubernetes 1.27.13 and 1.28.9 (fixes CVE-2024-3177)."
+    },
+    {
+      "category": "fixed",
+      "description": "Add Canal CNI version v3.27.3, having a fix to the ipset incompatibility bug."
+    }
+  ]
 }