[release/v2.23] Patch release version bump, KKP update (#6278)

* Update KKP version, bump patch * Update web for 2.23.5 patch release * Improve changelog * Update forgotten replace block in go.mod * Fix json format in changelog * Update KKP version * Improve changelog * Update KKP version * Update changelog
kubermatic · Oct 16, 2023 · 4f5c01f · 4f5c01f
1 parent 3602bf3
commit 4f5c01f
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.23.4
+KUBERMATIC_VERSION?=v2.23.5
 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.23.4
+KUBERMATIC_VERSION?=v2.23.5
 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,8 +67,8 @@ require (
 	gopkg.in/square/go-jose.v2 v2.6.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8c.io/kubeone v1.6.2
-	k8c.io/kubermatic/v2 v2.23.5-0.20231005111451-2808590653ba
-	k8c.io/operating-system-manager v1.3.2
+	k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1
+	k8c.io/operating-system-manager v1.3.3
 	k8c.io/reconciler v0.3.1
 	k8s.io/api v0.26.4
 	k8s.io/apiextensions-apiserver v0.26.4
@@ -102,7 +102,7 @@ replace (
 
 replace (
 	github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-20220810161552-7cce03887f34
-	k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.23.5-0.20231005111451-2808590653ba
+	k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1
 )
 
 require (

diff --git a/modules/api/go.sum b/modules/api/go.sum
@@ -1367,10 +1367,10 @@ 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.6.2 h1:3oEvD90kENhYzvvmSrMNjUam2fq7UMMKVp/Py57xs6M=
 k8c.io/kubeone v1.6.2/go.mod h1:5U/6sUZAkAl7uvC+VIDIA0VBZMBbFI9QD1C90kxb4qA=
-k8c.io/kubermatic/v2 v2.23.5-0.20231005111451-2808590653ba h1:ytmimE3uJBtBDaX+VgK3ltU3nK9NJ/xlYtVXNRPzuWI=
-k8c.io/kubermatic/v2 v2.23.5-0.20231005111451-2808590653ba/go.mod h1:FKGDdbKXVsG9zj+XiaaNHHAnvxGDizAENXbCrxrTTWE=
-k8c.io/operating-system-manager v1.3.2 h1:DdScdSdUywzT/mVn3GMEShiKPxHjEIPn3OrlefvUu/I=
-k8c.io/operating-system-manager v1.3.2/go.mod h1:kKDzXLWrC5BLpDbgXQFRpTVa5Fjru2S3ylxX5hZMRKA=
+k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1 h1:pOWveo4POhp8SvcPOFC7FAyxZ+olk7fFxZDV4eD7Nf0=
+k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1/go.mod h1:1HTLurvUZGrQSkXEKmqb0tBhxPDJoSyc0VHRpKZ/E+0=
+k8c.io/operating-system-manager v1.3.3 h1:8E58WGz+67+dDYuvAZu0QRRkslkWa4vMrbseQeRWceA=
+k8c.io/operating-system-manager v1.3.3/go.mod h1:kKDzXLWrC5BLpDbgXQFRpTVa5Fjru2S3ylxX5hZMRKA=
 k8c.io/reconciler v0.3.1 h1:fZ8gFvrDxjsJ6jdKogZVX9Er980EDUYnVPuOna32d0k=
 k8c.io/reconciler v0.3.1/go.mod h1:tEnGL+1N4TmlbgvXYgtZerhVU221NnmlUcK3WdOHzLo=
 k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=

diff --git a/modules/web/Makefile b/modules/web/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.23.4
+KUBERMATIC_VERSION?=v2.23.5
 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.23.4",
+  "version": "2.23.5",
   "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,13 +1,37 @@
 {
-  "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.23.md#v2234",
+  "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.23.md#v2235",
   "entries": [
+    {
+      "category": "added",
+      "description": "Introduce `DisableAdminKubeconfig` flag in `KubermaticSettings` to disable the admin kubeconfig feature from dashboard."
+    },
+    {
+      "category": "changed",
+      "description": "Add Cilium 1.13.7 as supported CNI version, deprecate Cilium version 1.13.6 as it's impacted by CVE-2023-39347, CVE-2023-41333 (Moderate Severity), CVE-2023-41332 (Low Severity)."
+    },
+    {
+      "category": "changed",
+      "description": "Update to OSM v1.3.3."
+    },
+    {
+      "category": "changed",
+      "description": "Update to nginx-ingress-controller v1.9.3 (fixes CVE-2023-44487, HTTP/2 rapid reset attack)."
+    },
+    {
+      "category": "changed",
+      "description": "Update web terminal to use latest curl version (8.4.0)."
+    },
+    {
+      "category": "fixed",
+      "description": "Operating system profile is configured correctly when updating a MachineDeployment now."
+    },
     {
       "category": "fixed",
-      "description": "No longer show 1.14.1 as available Cilium version as it was never supported."
+      "description": "Fix Hetzner API response validation for server type and networks."
     },
     {
       "category": "fixed",
-      "description": "If a vSphere user cluster uses a custom datastore, the seed's default datastore is no longer validated."
+      "description": "Fix logout failing when Keycloak is used as identity provider."
     }
   ]
 }