[release/v2.25] prepare 2.25.5 (#6717)

* [release/v2.25] prepare 2.25.5 * codegen
kubermatic · Jun 18, 2024 · bca9db4 · bca9db4
1 parent 32b556e
commit bca9db4
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.25.4
+KUBERMATIC_VERSION?=v2.25.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.25.4
+KUBERMATIC_VERSION?=v2.25.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/cmd/kubermatic-api/swagger.json b/modules/api/cmd/kubermatic-api/swagger.json
@@ -28636,7 +28636,7 @@
       "type": "object",
       "properties": {
         "coreDNSReplicas": {
-          "description": "CoreDNSReplicas is the number of desired pods of user cluster coredns deployment.",
+          "description": "CoreDNSReplicas is the number of desired pods of user cluster coredns deployment.\nDeprecated: This field should not be used anymore, use cluster.componentsOverride.coreDNS.replicas\ninstead. Only one of the two fields can be set at any time.",
           "type": "integer",
           "format": "int32",
           "x-go-name": "CoreDNSReplicas"

diff --git 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.1
+	github.com/kubermatic/machine-controller v1.59.2
 	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.4-0.20240521083353-17504acbdc2e
+	k8c.io/kubermatic/v2 v2.25.5-0.20240617102424-d406c7626975
 	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
@@ -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.1 h1:pbIz5IS9KoYtHIjQaOxWuToxFpYaEdJT1zS8Pw+QcH8=
-github.com/kubermatic/machine-controller v1.59.1/go.mod h1:HYulildntbPjGd+iCngysmUdOXC3vAxmcoyJV2oZiaw=
+github.com/kubermatic/machine-controller v1.59.2 h1:x6vZ1k1Lq0455+yEb0530Lxq1EgKFofWdkluSxZtfJs=
+github.com/kubermatic/machine-controller v1.59.2/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.4-0.20240521083353-17504acbdc2e h1:kaH1viDxeu9eRABrz7jT3uBhsUBV6x8/M/zLvBe8e+0=
-k8c.io/kubermatic/v2 v2.25.4-0.20240521083353-17504acbdc2e/go.mod h1:f+rMLISo1VPFT20auGx5Ob9Ay94KbNzq3zmsemoydd0=
+k8c.io/kubermatic/v2 v2.25.5-0.20240617102424-d406c7626975 h1:BSpdciz0orIA7D9IRmflm0FSJw4ALun9UpXLK1aIWQs=
+k8c.io/kubermatic/v2 v2.25.5-0.20240617102424-d406c7626975/go.mod h1:sWLlOO6amRMvqUr574RPk1tVc8mS9G2N+aDoIh89czQ=
 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/cluster_networking_config.go b/modules/api/pkg/test/e2e/utils/apiclient/models/cluster_networking_config.go
diff --git a/modules/web/Makefile b/modules/web/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.25.4
+KUBERMATIC_VERSION?=v2.25.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.25.4",
+  "version": "2.25.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,17 +1,21 @@
 {
-  "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2254",
+  "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2255",
   "entries": [
     {
       "category": "fixed",
-      "description": "Fix a bug where unrequired cloud-config secret was being propagated to the user clusters."
+      "description": "Fix support for Rockylinux 8 on AWS."
     },
     {
       "category": "fixed",
-      "description": "Fix a bug where externally deployed Velero CRDs are removed automatically from the user cluster."
+      "description": "Fix: use correct networkpolicy port for metrics-server."
     },
     {
-      "category": "changed",
-      "description": "Update OSM to v1.5.2; fixing cloud-init bootstrapping issues on Ubuntu 22.04 on Azure."
+      "category": "fixed",
+      "description": "Address inconsistencies in Helm that lead to an Application being stuck in \"pending-install\"."
+    },
+    {
+      "category": "fixed",
+      "description": "Fix a bug where CNI was always being defaulted to Cilium irrespective of what was configured in the cluster template or default cluster template."
     }
   ]
 }