From cc20fa349faef17438a836311d8ef816ae4117aa Mon Sep 17 00:00:00 2001 From: Archana Sawant Date: Thu, 18 Apr 2024 14:59:02 +0530 Subject: [PATCH] [release/v2.25]Bump version changes for KKP Apr 2024 patch release (#6652) * Bump version changes for KKP Apr 2024 patch release Signed-off-by: archups * Added release notes to the changelogs Signed-off-by: archups * Removed links for the release notes Signed-off-by: archups * Updated release notes and bump version changes Signed-off-by: archups * Fixed api-unit-test failures Signed-off-by: archups * Add release-notes Signed-off-by: archups --------- Signed-off-by: archups --- Makefile | 2 +- modules/api/Makefile | 2 +- modules/api/go.mod | 2 +- modules/api/go.sum | 4 +- .../cluster_default/cluster_default_test.go | 8 +- .../external_cluster/external_cluster_test.go | 8 +- modules/web/Makefile | 2 +- modules/web/package-lock.json | 4 +- modules/web/package.json | 2 +- modules/web/src/assets/config/changelog.json | 136 ++---------------- 10 files changed, 25 insertions(+), 145 deletions(-) diff --git a/Makefile b/Makefile index 3edf942d2b..1ac8c34e28 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.0 +KUBERMATIC_VERSION?=v2.25.1 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 8c6d9b3bdd..7838fb055c 100644 --- a/modules/api/Makefile +++ b/modules/api/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.0 +KUBERMATIC_VERSION?=v2.25.1 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 342f2e6e5b..d5058fc7cb 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.1-0.20240412101935-a4a9f00bb327 + k8c.io/kubermatic/v2 v2.25.1-0.20240417084102-89f399c42c26 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 cc378cbb82..e9aa0f6cef 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.1-0.20240412101935-a4a9f00bb327 h1:edXlrHwDVQGaBhWRNtBGrWQQQYnygfMT/CFohjKzsRY= -k8c.io/kubermatic/v2 v2.25.1-0.20240412101935-a4a9f00bb327/go.mod h1:dmFyeWNX+/fEwMPHjq8EqRev3F+BXn7zLzZzKqV0bH0= +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/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/api/pkg/handler/v2/cluster_default/cluster_default_test.go b/modules/api/pkg/handler/v2/cluster_default/cluster_default_test.go index f1c29450b1..51939206a0 100644 --- a/modules/api/pkg/handler/v2/cluster_default/cluster_default_test.go +++ b/modules/api/pkg/handler/v2/cluster_default/cluster_default_test.go @@ -50,7 +50,7 @@ func TestGetEndpoint(t *testing.T) { ), ExistingAPIUser: test.GenDefaultAPIUser(), ExpectedHTTPStatusCode: http.StatusOK, - ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","aws":{}},"version":"v1.28.7","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, + ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","aws":{}},"version":"v1.28.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, }, { Name: "Default cluster for Azure", @@ -61,7 +61,7 @@ func TestGetEndpoint(t *testing.T) { ), ExistingAPIUser: test.GenDefaultAPIUser(), ExpectedHTTPStatusCode: http.StatusOK, - ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","azure":{"assignAvailabilitySet":null}},"version":"v1.28.7","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, + ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","azure":{"assignAvailabilitySet":null}},"version":"v1.28.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, }, { Name: "Default cluster for vSphere", @@ -72,7 +72,7 @@ func TestGetEndpoint(t *testing.T) { ), ExistingAPIUser: test.GenDefaultAPIUser(), ExpectedHTTPStatusCode: http.StatusOK, - ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","vsphere":{}},"version":"v1.28.7","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, + ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","vsphere":{}},"version":"v1.28.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, }, { Name: "Default cluster for GCP", @@ -83,7 +83,7 @@ func TestGetEndpoint(t *testing.T) { ), ExistingAPIUser: test.GenDefaultAPIUser(), ExpectedHTTPStatusCode: http.StatusOK, - ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","gcp":{}},"version":"v1.28.7","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, + ExpectedResponse: `{"name":"","creationTimestamp":"0001-01-01T00:00:00Z","type":"kubernetes","spec":{"cloud":{"dc":"fake-dc","gcp":{}},"version":"v1.28.9","oidc":{},"enableUserSSHKeyAgent":true,"enableOperatingSystemManager":true,"kubernetesDashboard":{"enabled":true},"containerRuntime":"containerd","clusterNetwork":{"ipFamily":"IPv4","services":{"cidrBlocks":["10.240.16.0/20","fd02::/120"]},"pods":{"cidrBlocks":["172.25.0.0/16","fd01::/48"]},"nodeCidrMaskSizeIPv4":24,"nodeCidrMaskSizeIPv6":64,"dnsDomain":"cluster.local","proxyMode":"ipvs","ipvs":{"strictArp":true},"nodeLocalDNSCacheEnabled":true},"cniPlugin":{"type":"cilium","version":"1.14.9"},"exposeStrategy":"NodePort"},"status":{"version":"","url":"","externalCCMMigration":""}}`, }, } diff --git a/modules/api/pkg/handler/v2/external_cluster/external_cluster_test.go b/modules/api/pkg/handler/v2/external_cluster/external_cluster_test.go index 868cabf242..966f08a664 100644 --- a/modules/api/pkg/handler/v2/external_cluster/external_cluster_test.go +++ b/modules/api/pkg/handler/v2/external_cluster/external_cluster_test.go @@ -306,7 +306,7 @@ func TestListClusters(t *testing.T) { ID: "clusterAbcID", }, Spec: apiv1.ClusterSpec{ - Version: "v1.28.7", + Version: "v1.28.9", }, Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name}, }, @@ -316,7 +316,7 @@ func TestListClusters(t *testing.T) { ID: "clusterDefID", }, Spec: apiv1.ClusterSpec{ - Version: "v1.28.7", + Version: "v1.28.9", }, Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name}, }, @@ -339,7 +339,7 @@ func TestListClusters(t *testing.T) { ID: "clusterAbcID", }, Spec: apiv1.ClusterSpec{ - Version: "v1.28.7", + Version: "v1.28.9", }, Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name}, }, @@ -349,7 +349,7 @@ func TestListClusters(t *testing.T) { ID: "clusterDefID", }, Spec: apiv1.ClusterSpec{ - Version: "v1.28.7", + Version: "v1.28.9", }, Labels: map[string]string{kubermaticv1.ProjectIDLabelKey: test.GenDefaultProject().Name}, }, diff --git a/modules/web/Makefile b/modules/web/Makefile index d681dfc4fa..40547fdffa 100644 --- a/modules/web/Makefile +++ b/modules/web/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.25.0 +KUBERMATIC_VERSION?=v2.25.1 CC=npm GOOS ?= $(shell go env GOOS) export GOOS diff --git a/modules/web/package-lock.json b/modules/web/package-lock.json index 124a402a0e..a9c6e3a4bf 100644 --- a/modules/web/package-lock.json +++ b/modules/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "kubermatic-dashboard", - "version": "2.25.0", + "version": "2.25.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kubermatic-dashboard", - "version": "2.25.0", + "version": "2.25.1", "hasInstallScript": true, "license": "proprietary", "dependencies": { diff --git a/modules/web/package.json b/modules/web/package.json index e6c83d81cb..4fd92f72b0 100644 --- a/modules/web/package.json +++ b/modules/web/package.json @@ -1,7 +1,7 @@ { "name": "kubermatic-dashboard", "description": "Kubermatic Dashboard", - "version": "2.25.0", + "version": "2.25.1", "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 d443a65b50..db17af5294 100644 --- a/modules/web/src/assets/config/changelog.json +++ b/modules/web/src/assets/config/changelog.json @@ -1,149 +1,29 @@ { - "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md", + "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.25.md#v2251", "entries": [ { "category": "added", - "description": "Add support for Kubernetes 1.29." - }, - { - "category": "added", - "description": "Add support for Edge provider." - }, - { - "category": "added", - "description": "EE: Add KubeVirt to the Default Applications Catalog." - }, - { - "category": "added", - "description": "EE: Add k8sgpt operator to the Default Applications Catalog." - }, - { - "category": "added", - "description": "EE: Add nvidia-gpu-operator to the Default Applications Catalog." - }, - { - "category": "added", - "description": "EE: Update default application definitions with latest helm chart version." - }, - { - "category": "added", - "description": "Add logo, upstream documentation and source code link fields to the applications." - }, - { - "category": "added", - "description": "Comments are now persisted in the values section of ApplicationDefinitions and ApplicationInstallations when using the new defaultValuesBlock and valuesBlock fields respectively." - }, - { - "category": "added", - "description": "Add K8sGPT to the Webshell." - }, - { - "category": "added", - "description": "EE: Add new feature to create, restore and schedule backups for user cluster namespaces." - }, - { - "category": "added", - "description": "Support for configuring static network for flatcar machines." - }, - { - "category": "added", - "description": "Support for disabling CSI driver for user clusters." - }, - { - "category": "added", - "description": "Option to enable Cilium Ingress capabilities for user clusters." - }, - { - "category": "added", - "description": "Flatcar is now supported on GCE." - }, - { - "category": "added", - "description": "Added Flatcar as supported OS on VMware Cloud Director." - }, - { - "category": "added", - "description": "Add support for configuring allowed IP allocation modes for VMware Cloud Director." - }, - { - "category": "added", - "description": "Support for attaching multiple networks to a vApp on VMware Cloud Director." - }, - { - "category": "added", - "description": "Add `ClusterBackupStorageLocation` and related user cluster configurations." - }, - { - "category": "changed", - "description": "User Cluster MLA: Grafana has been updated to v10.2.2" - }, - { - "category": "changed", - "description": "API change: Update MachineDeployment form for Anexia provider. Add configuration support for named templates and multiple disks." + "description": "Add support for Kubernetes 1.27.13, 1.28.9 and 1.29.4 (fixes CVE-2024-3177)." }, { "category": "fixed", - "description": "Set LoadBalancerSKU on Azure clusters if the field is set in the preset." + "description": "Fix `csi` Addon not applying cleanly on Azure user clusters that were created with KKP <= 2.24" }, { "category": "fixed", - "description": "Fix a bug where Operating System Profiles were not being listed for GCP." + "description": "Cluster-autoscaler addon now works based on the namespace instead of cluster names; all MachineDeployments in the `kube-system` namespace are scaled." }, { "category": "fixed", - "description": "Fix a bug where dedicated credentials were incorrectly being required as mandatory input when editing provider settings for a cluster." + "description": "Add Canal CNI version v3.27.3, having a fix to the ipset incompatibility bug." }, { "category": "fixed", - "description": "Fix invalid project ID in API requests for Nutanix provider." - }, - { - "category": "fixed", - "description": "Fix a bug where OSPs were not being listed for VMware Cloud Director." - }, - { - "category": "fixed", - "description": "Fix issue in editing and updating applications of cluster template." - }, - { - "category": "fixed", - "description": "Fix issue with cursor position inside YAML editor." - }, - { - "category": "fixed", - "description": "Fix a bug where dedicated credentials were incorrectly being required as mandatory input when editing provider settings for a cluster." - }, - { - "category": "fixed", - "description": "No longer fail constructing vSphere endpoint when a `/` suffix is present in the datacenter configuration." - }, - { - "category": "fixed", - "description": "Resolved an issue where logs were duplicated when multiple pods from the same service were deployed on the same Kubernetes node." - }, - { - "category": "fixed", - "description": "Stop constantly re-deploying operating-system-manager when registry mirrors are configured." - }, - { - "category": "fixed", - "description": "Fix OIDC network policy, by allowing to set NamespaceOverride to specify where the ingress controller is deployed." - }, - { - "category": "fixed", - "description": "Fix missing image registry override for hubble-ui components if Cilium is deployed as System Application." - }, - { - "category": "fixed", - "description": "Enable web terminal button when at least one MD replica is ready." - }, - { - "category": "deprecated", - "description": "Deprecate v1.11 and v1.12 Cilium and Hubble KKP Addons, as Cilium CNI is managed by Applications from version 1.13." + "description": "Resolve conflict in determining available Kubernetes versions where upgrades where possible in `Cluster` object but not via the Dashboard." }, { - "category": "removed", - "description": "Some of high cardinality metrics were dropped from the User Cluster MLA Prometheus. If your KKP installation was using some of those metrics for the custom Grafana dashboards for the user clusters, your dashboards might stop showing some of the charts." + "category": "security", + "description": "Update Cilium to 1.14.9 and 1.13.14, mitigating CVE-2024-28860 and CVE-2024-28248." } ] }