Skip to content

Commit

Permalink
[release/v2.24] prepare v2.24.7 (#6675)
Browse files Browse the repository at this point in the history
  • Loading branch information
xrstf committed Apr 29, 2024
1 parent c421a83 commit 1ba5b92
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Makefile
@@ -1,6 +1,6 @@
SHELL=/bin/bash
export KUBERMATIC_EDITION ?= ee
KUBERMATIC_VERSION?=v2.24.6
KUBERMATIC_VERSION?=v2.24.7
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')
Expand Down
2 changes: 1 addition & 1 deletion modules/api/Makefile
@@ -1,6 +1,6 @@
SHELL=/bin/bash
export KUBERMATIC_EDITION ?= ee
KUBERMATIC_VERSION?=v2.24.6
KUBERMATIC_VERSION?=v2.24.7
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')
Expand Down
4 changes: 2 additions & 2 deletions modules/api/go.mod
Expand Up @@ -47,7 +47,7 @@ require (
github.com/gorilla/securecookie v1.1.1
github.com/gorilla/websocket v1.5.0
github.com/hetznercloud/hcloud-go v1.47.0
github.com/kubermatic/machine-controller v1.57.3
github.com/kubermatic/machine-controller v1.57.7
github.com/minio/minio-go/v7 v7.0.59
github.com/onsi/ginkgo v1.16.5
github.com/open-policy-agent/frameworks/constraint v0.0.0-20230712214810-96753a21c26f // v0.9.0+
Expand All @@ -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.20240417082402-056b0811caff
k8c.io/kubermatic/v2 v2.24.7-0.20240429084243-1cfcfe3aee8f
k8c.io/operating-system-manager v1.4.1
k8c.io/reconciler v0.4.0
k8s.io/api v0.28.2
Expand Down
8 changes: 4 additions & 4 deletions modules/api/go.sum
Expand Up @@ -579,8 +579,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
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.57.3 h1:i17ieepdav0q7zAoYRsxOwdZD4dQe4zDI5saqTR2CbI=
github.com/kubermatic/machine-controller v1.57.3/go.mod h1:vjuE/IcTxlRu4etiDyPasc4O7IcnKMgGl0zbcCjXgvs=
github.com/kubermatic/machine-controller v1.57.7 h1:/GnL2+g1BrsJVELeOJeKfZQRoJp7r+JqOaz3KXnieUI=
github.com/kubermatic/machine-controller v1.57.7/go.mod h1:vjuE/IcTxlRu4etiDyPasc4O7IcnKMgGl0zbcCjXgvs=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/labstack/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k=
Expand Down Expand Up @@ -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.20240417082402-056b0811caff h1:fznLPmO7fPwKcHQTlJN3F6BVuqN3X3N9Dyha6DnW3rU=
k8c.io/kubermatic/v2 v2.24.6-0.20240417082402-056b0811caff/go.mod h1:PUzG0zBBA4BArWSonWFAJLyhGsEJdeK9KtbXT2kADTI=
k8c.io/kubermatic/v2 v2.24.7-0.20240429084243-1cfcfe3aee8f h1:weQEA6imcn3Q8CDP9nf8ics8BA4gyuOM0wzsm424R0E=
k8c.io/kubermatic/v2 v2.24.7-0.20240429084243-1cfcfe3aee8f/go.mod h1:cXUC8ueMI/PAkdjAwZOsB8VBJrpB/a6K2rPFK+p2/1o=
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=
Expand Down
2 changes: 1 addition & 1 deletion modules/web/Makefile
@@ -1,6 +1,6 @@
SHELL=/bin/bash
export KUBERMATIC_EDITION ?= ee
KUBERMATIC_VERSION?=v2.24.6
KUBERMATIC_VERSION?=v2.24.7
CC=npm
GOOS ?= $(shell go env GOOS)
export GOOS
Expand Down
4 changes: 2 additions & 2 deletions modules/web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/web/package.json
@@ -1,7 +1,7 @@
{
"name": "kubermatic-dashboard",
"description": "Kubermatic Dashboard",
"version": "2.24.6",
"version": "2.24.7",
"type": "module",
"license": "proprietary",
"repository": "https://github.com/kubermatic/dashboard",
Expand Down
16 changes: 12 additions & 4 deletions modules/web/src/assets/config/changelog.json
@@ -1,13 +1,21 @@
{
"externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.24.md#v2246",
"externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.24.md#v2247",
"entries": [
{
"category": "added",
"description": "Add support for Kubernetes 1.27.13 and 1.28.9 (fixes CVE-2024-3177)."
"category": "fixed",
"description": "Fix template value for MachineDeployments in edit mode"
},
{
"category": "fixed",
"description": "Hotfix to mitigate a bug in new releases of Chromium that causes browser crashes on `mat-select` component"
},
{
"category": "fixed",
"description": "vSphere: fix anti-affinity DRS configuration for VMs"
},
{
"category": "fixed",
"description": "Add Canal CNI version v3.27.3, having a fix to the ipset incompatibility bug."
"description": "Fix Azure CCM not being reconciled because of labelling changes"
}
]
}

0 comments on commit 1ba5b92

Please sign in to comment.