[release/v2.23] Patch release 2.23.6 (#6318)

* Bump KKP version * Bump version to 2.23.6 * Bump swagger and api client * Whitelist deprecated field in linter
kubermatic · Oct 24, 2023 · 0158001 · 0158001
1 parent 4f5c01f
commit 0158001
Show file tree

Hide file tree

Showing 31 changed files with 227 additions and 159 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.23.5
+KUBERMATIC_VERSION?=v2.23.6
 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/.golangci.yml b/modules/api/.golangci.yml
@@ -79,6 +79,7 @@ issues:
   - singleCaseSwitch # in most cases this is the beginning of a lookup table and should be kept an obvious table
   # govet
   - loop variable tc captured by func literal # TODO: fix tests and remove this exclude
+  - "credentials.VMNetName is deprecated: Use networks instead"
 
 linters-settings:
   depguard:

diff --git a/modules/api/Makefile b/modules/api/Makefile
@@ -1,6 +1,6 @@
 SHELL=/bin/bash
 export KUBERMATIC_EDITION ?= ee
-KUBERMATIC_VERSION?=v2.23.5
+KUBERMATIC_VERSION?=v2.23.6
 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
diff --git a/modules/api/go.mod b/modules/api/go.mod
@@ -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.6.2
-	k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1
+	k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0
 	k8c.io/operating-system-manager v1.3.3
 	k8c.io/reconciler v0.3.1
 	k8s.io/api 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.5-0.20231015130915-4eb6fcf4b1c1
+	k8c.io/kubermatic/v2 => k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0
 )
 
 require (

diff --git a/modules/api/go.sum b/modules/api/go.sum
@@ -1367,8 +1367,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.6.2 h1:3oEvD90kENhYzvvmSrMNjUam2fq7UMMKVp/Py57xs6M=
 k8c.io/kubeone v1.6.2/go.mod h1:5U/6sUZAkAl7uvC+VIDIA0VBZMBbFI9QD1C90kxb4qA=
-k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1 h1:pOWveo4POhp8SvcPOFC7FAyxZ+olk7fFxZDV4eD7Nf0=
-k8c.io/kubermatic/v2 v2.23.5-0.20231015130915-4eb6fcf4b1c1/go.mod h1:1HTLurvUZGrQSkXEKmqb0tBhxPDJoSyc0VHRpKZ/E+0=
+k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0 h1:IYHkXX/ZXWbyxAQxq4t8LbhHmdSaS3Q5Fy2C1eJrUx8=
+k8c.io/kubermatic/v2 v2.23.6-0.20231023131608-052c6062c1a0/go.mod h1:1HTLurvUZGrQSkXEKmqb0tBhxPDJoSyc0VHRpKZ/E+0=
 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/reconciler v0.3.1 h1:fZ8gFvrDxjsJ6jdKogZVX9Er980EDUYnVPuOna32d0k=

diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/a_k_s.go b/modules/api/pkg/test/e2e/utils/apiclient/models/a_k_s.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s.go b/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/a_w_s_cloud_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba.go b/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/alibaba_cloud_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/anexia_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/anexia_cloud_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/azure.go b/modules/api/pkg/test/e2e/utils/apiclient/models/azure.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/azure_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/azure_cloud_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go b/modules/api/pkg/test/e2e/utils/apiclient/models/datacenter_spec_openstack.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/digitalocean_cloud_spec.go b/modules/api/pkg/test/e2e/utils/apiclient/models/digitalocean_cloud_spec.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/e_k_s.go b/modules/api/pkg/test/e2e/utils/apiclient/models/e_k_s.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/g_c_p.go b/modules/api/pkg/test/e2e/utils/apiclient/models/g_c_p.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/kubevirt.go b/modules/api/pkg/test/e2e/utils/apiclient/models/kubevirt.go
diff --git a/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix.go b/modules/api/pkg/test/e2e/utils/apiclient/models/nutanix.go