From 212656a92ca56fae5d636eac8076e4991a5d4936 Mon Sep 17 00:00:00 2001 From: Archana Sawant Date: Mon, 19 Feb 2024 18:19:47 +0530 Subject: [PATCH] [release/v2.23] Bump version to v2.23.11 (#6532) Signed-off-by: archups --- Makefile | 2 +- modules/api/Makefile | 2 +- modules/api/cmd/kubermatic-api/swagger.json | 24 +++++++++---------- modules/api/go.mod | 6 ++--- modules/api/go.sum | 8 +++---- modules/web/Makefile | 2 +- modules/web/go.mod | 6 +++-- modules/web/go.sum | 14 ++++++----- modules/web/package-lock.json | 2 +- modules/web/package.json | 2 +- modules/web/src/assets/config/changelog.json | 25 ++------------------ 11 files changed, 38 insertions(+), 55 deletions(-) diff --git a/Makefile b/Makefile index 50f21850de..87eaf28ef2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.23.10 +KUBERMATIC_VERSION?=v2.23.11 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 0bbd5e0f9b..3b305016dc 100644 --- a/modules/api/Makefile +++ b/modules/api/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.23.10 +KUBERMATIC_VERSION?=v2.23.11 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 index 9f40cc09a5..8c4d148f30 100644 --- a/modules/api/cmd/kubermatic-api/swagger.json +++ b/modules/api/cmd/kubermatic-api/swagger.json @@ -14190,6 +14190,13 @@ ], "operationId": "listAWSSizesNoCredentialsV2", "parameters": [ + { + "type": "string", + "x-go-name": "Architecture", + "description": "architecture query parameter. Supports: arm64 and x64 types.", + "name": "architecture", + "in": "query" + }, { "type": "string", "x-go-name": "ProjectID", @@ -14203,13 +14210,6 @@ "name": "cluster_id", "in": "path", "required": true - }, - { - "type": "string", - "x-go-name": "Architecture", - "description": "architecture query parameter. Supports: arm64 and x64 types.", - "name": "architecture", - "in": "query" } ], "responses": { @@ -14724,6 +14724,11 @@ ], "operationId": "listKubeVirtInstancetypesNoCredentials", "parameters": [ + { + "type": "string", + "name": "DatacenterName", + "in": "header" + }, { "type": "string", "x-go-name": "ProjectID", @@ -14737,11 +14742,6 @@ "name": "cluster_id", "in": "path", "required": true - }, - { - "type": "string", - "name": "DatacenterName", - "in": "header" } ], "responses": { diff --git a/modules/api/go.mod b/modules/api/go.mod index 77d55b4760..7ecceed8b1 100644 --- 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.11-0.20240206183359-fd451a1c566b - k8c.io/operating-system-manager v1.3.3 + k8c.io/kubermatic/v2 v2.23.11-0.20240215191743-318262868e91 + k8c.io/operating-system-manager v1.3.4 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.11-0.20240206183359-fd451a1c566b + k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.23.11-0.20240215191743-318262868e91 ) require ( diff --git a/modules/api/go.sum b/modules/api/go.sum index 5b983cb5fd..06635b2993 100644 --- 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.11-0.20240206183359-fd451a1c566b h1:JLhjcFBXLwoh9TZ9NuhVqg/23cbft/qfWjUiWO6kStA= -k8c.io/kubermatic/v2 v2.23.11-0.20240206183359-fd451a1c566b/go.mod h1:7th2Sx1gX7nQdMVJFuXSo/fzaIMc11TMg2C7U3slGyc= -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/kubermatic/v2 v2.23.11-0.20240215191743-318262868e91 h1:UFlagoxtUZqMR4CPGktnP/kJDIJJaVqrt1MEoGgdAi4= +k8c.io/kubermatic/v2 v2.23.11-0.20240215191743-318262868e91/go.mod h1:1db/9/QzRMKLiNZ//cSP5oPx3Cbs4kfY/hCSRhGFWLI= +k8c.io/operating-system-manager v1.3.4 h1:wNGCXZ+UyaLDJNprBv9P2RSNeO8ecsk54kbJD7vxET8= +k8c.io/operating-system-manager v1.3.4/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 index 2c331f6125..46cd704ece 100644 --- a/modules/web/Makefile +++ b/modules/web/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.23.10 +KUBERMATIC_VERSION?=v2.23.11 CC=npm GOOS ?= $(shell go env GOOS) export GOOS diff --git a/modules/web/go.mod b/modules/web/go.mod index a73ef49e0d..b29da56786 100644 --- a/modules/web/go.mod +++ b/modules/web/go.mod @@ -8,16 +8,18 @@ require ( ) require ( + github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - github.com/stretchr/testify v1.8.1 // indirect + github.com/stretchr/testify v1.8.2 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.8.0 // indirect + golang.org/x/sys v0.9.0 // indirect google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/modules/web/go.sum b/modules/web/go.sum index e077b49b46..7728c01aa9 100644 --- a/modules/web/go.sum +++ b/modules/web/go.sum @@ -1,4 +1,5 @@ -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -14,7 +15,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= @@ -30,8 +32,8 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= @@ -40,8 +42,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= +golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= diff --git a/modules/web/package-lock.json b/modules/web/package-lock.json index f7cbe9fe6e..c141ff5f06 100644 --- a/modules/web/package-lock.json +++ b/modules/web/package-lock.json @@ -1,6 +1,6 @@ { "name": "kubermatic-dashboard", - "version": "2.23.10", + "version": "2.23.11", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/modules/web/package.json b/modules/web/package.json index dde8eddcad..9fc64018cf 100644 --- a/modules/web/package.json +++ b/modules/web/package.json @@ -1,7 +1,7 @@ { "name": "kubermatic-dashboard", "description": "Kubermatic Dashboard", - "version": "2.23.10", + "version": "2.23.11", "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 f16f74d762..c57cff6781 100644 --- a/modules/web/src/assets/config/changelog.json +++ b/modules/web/src/assets/config/changelog.json @@ -1,25 +1,4 @@ { - "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.23.md#v2239", - "entries": [ - { - "category": "added", - "description": "Add support for Kubernetes v1.24.17, v1.25.16, v1.26.13, v1.27.10." - }, - { - "category": "changed", - "description": "Set default Kubernetes version to v1.26.13." - }, - { - "category": "changed", - "description": "Update EKS/AKS version matrix to only include Kubernetes versions supported by those managed offerings. For AKS 1.26-1.28 are supported, for EKS 1.24 to 1.28. The default for newly created external clusters is now 1.28." - }, - { - "category": "fixed", - "description": "Stop constantly re-deploying operating-system-manager when registry mirrors are configured." - }, - { - "category": "fixed", - "description": "Fix a bug where Operating System Profiles were not being listed for GCP/GCE." - } - ] + "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.23.md#v22311", + "entries": [] }