Skip to content

Commit 75bad7b

Browse files
archupsarchups
authored
[release/v2.26] Bump KKP dependency and version for KKP patch release 2.26.13 (#7592)
* [release/v2.26] Bump KKP dependency and version for KKP patch release 2.26.13 Signed-off-by: Archana Sawant <[email protected]> * Fix typecheck and licenses error Signed-off-by: Archana Sawant <[email protected]> --------- Signed-off-by: Archana Sawant <[email protected]>
1 parent 4ceb837 commit 75bad7b

File tree

9 files changed

+22
-13
lines changed

9 files changed

+22
-13
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHELL = /bin/bash -eu -o pipefail
22
export KUBERMATIC_EDITION ?= ee
3-
KUBERMATIC_VERSION?=v2.26.12
3+
KUBERMATIC_VERSION?=v2.26.13
44
DOCKER_REPO ?= quay.io/kubermatic
55
REPO = $(DOCKER_REPO)/dashboard$(shell [[ "$(KUBERMATIC_EDITION)" != "ce" ]] && printf -- '-%s' ${KUBERMATIC_EDITION})
66
IMAGE_TAG=$(shell echo $$(git rev-parse HEAD)|tr -d '\n')

‎modules/api/.wwhrd.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ exceptions:
3737
- github.com/hashicorp/go-version # MPL-2.0
3838
- github.com/hashicorp/go-retryablehttp # MPL-2.0
3939
- github.com/hashicorp/golang-lru # MPL-2.0
40+
- github.com/hashicorp/golang-lru/arc/v2 # MPL-2.0
4041
- github.com/hashicorp/golang-lru/simplelru # MPL-2.0
42+
- github.com/hashicorp/golang-lru/v2/internal # MPL-2.0
43+
- github.com/hashicorp/golang-lru/v2/simplelru # MPL-2.0
4144
- github.com/hashicorp/hcl # MPL-2.0
4245
- github.com/hashicorp/hcl/hcl/ast # MPL-2.0
4346
- github.com/hashicorp/hcl/hcl/parser # MPL-2.0

‎modules/api/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHELL = /bin/bash -eu -o pipefail
22
export KUBERMATIC_EDITION ?= ee
3-
KUBERMATIC_VERSION?=v2.26.12
3+
KUBERMATIC_VERSION?=v2.26.13
44
DOCKER_REPO ?= quay.io/kubermatic
55
REPO = $(DOCKER_REPO)/dashboard$(shell [[ "$(KUBERMATIC_EDITION)" != "ce" ]] && printf -- '-%s' ${KUBERMATIC_EDITION})
66
IMAGE_TAG=$(shell echo $$(git rev-parse HEAD)|tr -d '\n')

‎modules/api/go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ require (
6969
google.golang.org/api v0.197.0
7070
gopkg.in/yaml.v3 v3.0.1
7171
k8c.io/kubeone v1.7.3
72-
k8c.io/kubermatic/v2 v2.26.12-0.20250813092354-842f307ff061
72+
k8c.io/kubermatic/v2 v2.26.13-0.20250915160303-cc5d475a016a
7373
k8c.io/machine-controller v1.60.2
74-
k8c.io/operating-system-manager v1.6.8
74+
k8c.io/operating-system-manager v1.6.9
7575
k8c.io/reconciler v0.5.0
7676
k8s.io/api v0.32.2
7777
k8s.io/apiextensions-apiserver v0.32.2
@@ -177,6 +177,8 @@ require (
177177
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
178178
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
179179
github.com/hashicorp/go-version v1.7.0 // indirect
180+
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
181+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
180182
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
181183
github.com/huandu/xstrings v1.5.0 // indirect
182184
github.com/inconshreveable/mousetrap v1.1.0 // indirect

‎modules/api/go.sum‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,10 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe
411411
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
412412
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
413413
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
414+
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 h1:QxkVTxwColcduO+LP7eJO56r2hFiG8zEbfAAzRv52KQ=
415+
github.com/hashicorp/golang-lru/arc/v2 v2.0.7/go.mod h1:Pe7gBlGdc8clY5LJ0LpJXMt5AmgmWNH1g+oFFVUHOEc=
416+
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
417+
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
414418
github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM=
415419
github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM=
416420
github.com/hetznercloud/hcloud-go v1.57.0 h1:aQZZFoJZcq9C1rGX/efZHyyRRmIJxND6tRf98NfIoSc=
@@ -1094,12 +1098,12 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
10941098
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
10951099
k8c.io/kubeone v1.7.3 h1:KZ2Q6LQMxoiFf9UQ3ugqjid39NccduhJ50bdbP5tdIU=
10961100
k8c.io/kubeone v1.7.3/go.mod h1:9v2VFz/+l36cW65kd5YufEYHunbKlJ6P8SBakj05xgM=
1097-
k8c.io/kubermatic/v2 v2.26.12-0.20250813092354-842f307ff061 h1:JGEayhWglJrHV/+TGeyWsihkdOAmj/zyUlZ+cMZb2Os=
1098-
k8c.io/kubermatic/v2 v2.26.12-0.20250813092354-842f307ff061/go.mod h1:p26RxFCXVEtdCF5fuh4vBN8NzM3JU7bNt55AGwOEkZM=
1101+
k8c.io/kubermatic/v2 v2.26.13-0.20250915160303-cc5d475a016a h1:UUk2CjVezZ9FZdUlIJhvBzL4Ete40izkWoRxhm2hzkc=
1102+
k8c.io/kubermatic/v2 v2.26.13-0.20250915160303-cc5d475a016a/go.mod h1:4JJsNsX3ecM7TJG35+7FVoZ1aEKRd9skPWDuWZq+2cM=
10991103
k8c.io/machine-controller v1.60.2 h1:w5Q1BT5htSCvzRhRhyg7tzvmjLZR3cIGgDZxwl267vg=
11001104
k8c.io/machine-controller v1.60.2/go.mod h1:j9SHRLpzFj5wOMlhdPJL+ub08P8rvVvQOFtg7JaLYb4=
1101-
k8c.io/operating-system-manager v1.6.8 h1:KGDc4Xd3pLJ6/AmmJXgYY5xXnCU8QX6HJ9H/Ok8Ons8=
1102-
k8c.io/operating-system-manager v1.6.8/go.mod h1:Dh9IZp5pb5G3s2r6ZrHUb+gTuHw5AmbIFYuFxIcgU7o=
1105+
k8c.io/operating-system-manager v1.6.9 h1:TdzgPmP/whJ1vxDlgqQd8snNdNyWNJxqyjxsewcDPm0=
1106+
k8c.io/operating-system-manager v1.6.9/go.mod h1:Dh9IZp5pb5G3s2r6ZrHUb+gTuHw5AmbIFYuFxIcgU7o=
11031107
k8c.io/reconciler v0.5.0 h1:BHpelg1UfI/7oBFctqOq8sX6qzflXpl3SlvHe7e8wak=
11041108
k8c.io/reconciler v0.5.0/go.mod h1:pT1+SVcVXJQeBJhpJBXQ5XW64QnKKeYTnVlQf0dGE0k=
11051109
k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ=

‎modules/api/pkg/ee/metering/report_handler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func getS3DataFromSeed(ctx context.Context, seed *kubermaticv1.Seed, seedClient
239239
s3accessKeyID := string(s3secret.Data[AccessKey])
240240
s3secretAccessKey := string(s3secret.Data[SecretKey])
241241

242-
mc, err := s3.NewClient(s3endpoint, s3accessKeyID, s3secretAccessKey, caBundle.CertPool())
242+
mc, err := s3.NewClient(s3endpoint, s3accessKeyID, s3secretAccessKey, caBundle.String())
243243
if err != nil {
244244
return nil, "", err
245245
}

‎modules/web/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHELL = /bin/bash -eu -o pipefail
22
export KUBERMATIC_EDITION ?= ee
3-
KUBERMATIC_VERSION?=v2.26.12
3+
KUBERMATIC_VERSION?=v2.26.13
44
CC=npm
55
GOOS ?= $(shell go env GOOS)
66
export GOOS

‎modules/web/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "kubermatic-dashboard",
33
"description": "Kubermatic Dashboard",
4-
"version": "2.26.12",
4+
"version": "2.26.13",
55
"type": "module",
66
"license": "proprietary",
77
"repository": "https://github.com/kubermatic/dashboard",

0 commit comments

Comments
 (0)