From 897ac5cbf42f0c517997be8da01291b10d687d7b Mon Sep 17 00:00:00 2001 From: Akash Gautam Date: Mon, 19 Feb 2024 18:19:47 +0530 Subject: [PATCH] changes for v2.22.13 release (#6533) Signed-off-by: Akash Gautam --- Makefile | 2 +- modules/api/Makefile | 2 +- modules/api/cmd/kubermatic-api/swagger.json | 24 ++++++++++---------- modules/api/go.mod | 4 ++-- modules/api/go.sum | 4 ++-- modules/web/Makefile | 2 +- modules/web/go.mod | 5 ++-- modules/web/go.sum | 11 +++++---- modules/web/package-lock.json | 4 ++-- modules/web/package.json | 2 +- modules/web/src/assets/config/changelog.json | 17 ++------------ 11 files changed, 33 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index 15ab91a3ff..23dd27e223 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.22.12 +KUBERMATIC_VERSION?=v2.22.13 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 b7cb5e81ea..36bc7b665e 100644 --- a/modules/api/Makefile +++ b/modules/api/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.22.12 +KUBERMATIC_VERSION?=v2.22.13 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 6b6fca5413..d981c21b8e 100644 --- a/modules/api/cmd/kubermatic-api/swagger.json +++ b/modules/api/cmd/kubermatic-api/swagger.json @@ -14190,13 +14190,6 @@ ], "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", @@ -14210,6 +14203,13 @@ "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,11 +14724,6 @@ ], "operationId": "listKubeVirtInstancetypesNoCredentials", "parameters": [ - { - "type": "string", - "name": "DatacenterName", - "in": "header" - }, { "type": "string", "x-go-name": "ProjectID", @@ -14742,6 +14737,11 @@ "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 c48f031162..3951e7f54a 100644 --- a/modules/api/go.mod +++ b/modules/api/go.mod @@ -102,12 +102,12 @@ replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-2022081 replace ( k8c.io/kubeone => k8c.io/kubeone v1.5.0-beta.0.0.20230216134849-7f23d49b8002 - k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.22.12-0.20240119155030-abd254e90c05 + k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.22.13-0.20240202122358-22c7048fd988 ) require ( github.com/pkg/errors v0.9.1 - k8c.io/kubermatic/v2 v2.22.12-0.20240119155030-abd254e90c05 + k8c.io/kubermatic/v2 v2.22.13-0.20240202122358-22c7048fd988 ) require ( diff --git a/modules/api/go.sum b/modules/api/go.sum index d713134675..798940a276 100644 --- a/modules/api/go.sum +++ b/modules/api/go.sum @@ -1350,8 +1350,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.5.0-beta.0.0.20230216134849-7f23d49b8002 h1:x94uM0sD4hyXbubuxu1qjtJHm30Qt+OnpcwL8EWbHCc= k8c.io/kubeone v1.5.0-beta.0.0.20230216134849-7f23d49b8002/go.mod h1:uPtvJZ2qS1Xxi+frzrW0CNB1GNsT6PQJsZBtHG2leEg= -k8c.io/kubermatic/v2 v2.22.12-0.20240119155030-abd254e90c05 h1:yHsn1BcOSE8PrKGHB/4ZirPb78rYixz97ytgrwGLBjc= -k8c.io/kubermatic/v2 v2.22.12-0.20240119155030-abd254e90c05/go.mod h1:g2DimKmNj0TB1nvAaEkkey0r0NyGdmaRUJ8Kv/0spm0= +k8c.io/kubermatic/v2 v2.22.13-0.20240202122358-22c7048fd988 h1:e7sW4ozITfIeOorI9+R0q2SB8LQxuKTjwJ8+HHS/mRY= +k8c.io/kubermatic/v2 v2.22.13-0.20240202122358-22c7048fd988/go.mod h1:g2DimKmNj0TB1nvAaEkkey0r0NyGdmaRUJ8Kv/0spm0= k8c.io/operating-system-manager v1.2.3 h1:FRxd/1WrcEwjbn62yM/lJOcGf7ZnBoSapKrlABh4NVE= k8c.io/operating-system-manager v1.2.3/go.mod h1:POlB8/WtJ+RJUrnA3Nfbzej+23PlMx9OUvpSnM4fJcU= k8c.io/reconciler v0.3.1 h1:fZ8gFvrDxjsJ6jdKogZVX9Er980EDUYnVPuOna32d0k= diff --git a/modules/web/Makefile b/modules/web/Makefile index f0d0bd44ff..0d692a8058 100644 --- a/modules/web/Makefile +++ b/modules/web/Makefile @@ -1,6 +1,6 @@ SHELL=/bin/bash export KUBERMATIC_EDITION ?= ee -KUBERMATIC_VERSION?=v2.22.12 +KUBERMATIC_VERSION?=v2.22.13 CC=npm GOOS ?= $(shell go env GOOS) export GOOS diff --git a/modules/web/go.mod b/modules/web/go.mod index 44fb8bfafb..0611454566 100644 --- a/modules/web/go.mod +++ b/modules/web/go.mod @@ -10,14 +10,15 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/golang/protobuf v1.5.2 // 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.3.0 // indirect github.com/prometheus/common v0.39.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/stretchr/testify v1.8.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/sys v0.3.0 // indirect + golang.org/x/sys v0.9.0 // indirect google.golang.org/protobuf v1.28.1 // indirect ) diff --git a/modules/web/go.sum b/modules/web/go.sum index 5c04c155de..d94dc41f29 100644 --- a/modules/web/go.sum +++ b/modules/web/go.sum @@ -9,13 +9,14 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= @@ -41,8 +42,8 @@ go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTV 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.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.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 ebd3645583..23c2dbaaaf 100644 --- a/modules/web/package-lock.json +++ b/modules/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "kubermatic-dashboard", - "version": "2.22.12", + "version": "2.22.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "kubermatic-dashboard", - "version": "2.22.12", + "version": "2.22.13", "hasInstallScript": true, "license": "proprietary", "dependencies": { diff --git a/modules/web/package.json b/modules/web/package.json index 654ee82c9e..64d1dcfe0c 100644 --- a/modules/web/package.json +++ b/modules/web/package.json @@ -1,7 +1,7 @@ { "name": "kubermatic-dashboard", "description": "Kubermatic Dashboard", - "version": "2.22.12", + "version": "2.22.13", "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 d5f33d9e01..2aef289701 100644 --- a/modules/web/src/assets/config/changelog.json +++ b/modules/web/src/assets/config/changelog.json @@ -1,17 +1,4 @@ { - "externalChangelogURL": "https://github.com/kubermatic/kubermatic/blob/main/docs/changelogs/CHANGELOG-2.22.md#v22212", - "entries": [ - { - "category": "added", - "description": "Add support for Kubernetes v1.24.17, v1.25.16 and v1.26.13 and set default version to v1.25.16." - }, - { - "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": "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.22.md#v22213", + "entries": [] }