Skip to content

Commit ba02917

Browse files
authored
[Feature] Bump K8S Version to 1.25.12 (#1372)
1 parent c89b45f commit ba02917

File tree

4 files changed

+167
-33
lines changed

4 files changed

+167
-33
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- (Feature) Numactl Options
1111
- (Maintenance) Bump K8S Version to 1.23.17
1212
- (Maintenance) Bump K8S Version to 1.24.16
13+
- (Maintenance) Bump K8S Version to 1.25.12
1314

1415
## [1.2.31](https://github.com/arangodb/kube-arangodb/tree/1.2.31) (2023-07-14)
1516
- (Improvement) Block traffic on the services if there is more than 1 active leader in ActiveFailover mode

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ifeq ($(shell uname),Darwin)
99
REALPATH ?= grealpath
1010
endif
1111

12-
KUBERNETES_VERSION_MINOR:=24
13-
KUBERNETES_VERSION_PATCH:=16
12+
KUBERNETES_VERSION_MINOR:=25
13+
KUBERNETES_VERSION_PATCH:=12
1414

1515
PROJECT := arangodb_operator
1616
SCRIPTDIR := $(shell pwd)

go.mod

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ replace (
99
github.com/stretchr/testify => github.com/stretchr/testify v1.5.1
1010
github.com/ugorji/go => github.com/ugorji/go v0.0.0-20181209151446-772ced7fd4c2
1111

12-
k8s.io/api => k8s.io/api v0.24.16
13-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.16
14-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.16
15-
k8s.io/apiserver => k8s.io/apiserver v0.24.16
16-
k8s.io/client-go => k8s.io/client-go v0.24.16
17-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.16
18-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.16
12+
k8s.io/api => k8s.io/api v0.25.12
13+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.12
14+
k8s.io/apimachinery => k8s.io/apimachinery v0.25.12
15+
k8s.io/apiserver => k8s.io/apiserver v0.25.12
16+
k8s.io/client-go => k8s.io/client-go v0.25.12
17+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.12
18+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.12
1919
k8s.io/code-generator => ./deps/k8s.io/code-generator
20-
k8s.io/component-base => k8s.io/component-base v0.24.16
21-
k8s.io/kubernetes => k8s.io/kubernetes v0.24.16
22-
k8s.io/metrics => k8s.io/metrics v0.24.16
20+
k8s.io/component-base => k8s.io/component-base v0.25.12
21+
k8s.io/kubernetes => k8s.io/kubernetes v0.25.12
22+
k8s.io/metrics => k8s.io/metrics v0.25.12
2323
)
2424

2525
require (
@@ -53,18 +53,18 @@ require (
5353
google.golang.org/grpc v1.53.0
5454
google.golang.org/protobuf v1.30.0
5555
gopkg.in/yaml.v3 v3.0.1
56-
k8s.io/api v0.24.16
57-
k8s.io/apiextensions-apiserver v0.24.16
58-
k8s.io/apimachinery v0.24.16
59-
k8s.io/client-go v0.24.16
56+
k8s.io/api v0.25.12
57+
k8s.io/apiextensions-apiserver v0.25.12
58+
k8s.io/apimachinery v0.25.12
59+
k8s.io/client-go v0.25.12
6060
sigs.k8s.io/yaml v1.2.0
6161
)
6262

6363
require (
6464
github.com/NYTimes/gziphandler v1.1.1 // indirect
6565
github.com/PuerkitoBio/purell v1.1.1 // indirect
6666
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
67-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
67+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
6868
github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
6969
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
7070
github.com/beorn7/perks v1.0.1 // indirect
@@ -78,12 +78,13 @@ require (
7878
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
7979
github.com/davecgh/go-spew v1.1.1 // indirect
8080
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
81+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
8182
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
8283
github.com/felixge/httpsnoop v1.0.1 // indirect
8384
github.com/fsnotify/fsnotify v1.4.9 // indirect
8485
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
8586
github.com/gin-contrib/sse v0.1.0 // indirect
86-
github.com/go-logr/logr v1.2.0 // indirect
87+
github.com/go-logr/logr v1.2.3 // indirect
8788
github.com/go-openapi/jsonpointer v0.19.5 // indirect
8889
github.com/go-openapi/jsonreference v0.19.5 // indirect
8990
github.com/go-openapi/swag v0.21.1 // indirect
@@ -94,15 +95,15 @@ require (
9495
github.com/gogo/protobuf v1.3.2 // indirect
9596
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9697
github.com/golang/protobuf v1.5.2 // indirect
97-
github.com/google/cel-go v0.10.4 // indirect
98+
github.com/google/cel-go v0.12.6 // indirect
9899
github.com/google/gnostic v0.5.7-v3refs // indirect
99100
github.com/google/go-cmp v0.5.9 // indirect
100101
github.com/google/gofuzz v1.1.0 // indirect
101102
github.com/google/uuid v1.3.0 // indirect
102103
github.com/googleapis/gnostic v0.5.5 // indirect
103104
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
104105
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
105-
github.com/imdario/mergo v0.3.5 // indirect
106+
github.com/imdario/mergo v0.3.6 // indirect
106107
github.com/inconshreveable/mousetrap v1.0.0 // indirect
107108
github.com/josharian/intern v1.0.0 // indirect
108109
github.com/json-iterator/go v1.1.12 // indirect
@@ -125,9 +126,9 @@ require (
125126
github.com/stretchr/objx v0.2.0 // indirect
126127
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
127128
github.com/ugorji/go/codec v1.2.11 // indirect
128-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
129-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
130-
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
129+
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
130+
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
131+
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
131132
go.opentelemetry.io/contrib v0.20.0 // indirect
132133
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
133134
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
@@ -154,17 +155,17 @@ require (
154155
gopkg.in/inf.v0 v0.9.1 // indirect
155156
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
156157
gopkg.in/yaml.v2 v2.4.0 // indirect
157-
k8s.io/apiserver v0.24.16 // indirect
158-
k8s.io/cloud-provider v0.24.16 // indirect
159-
k8s.io/cluster-bootstrap v0.24.16 // indirect
160-
k8s.io/code-generator v0.24.16 // indirect
161-
k8s.io/component-base v0.24.16 // indirect
158+
k8s.io/apiserver v0.25.12 // indirect
159+
k8s.io/cloud-provider v0.25.12 // indirect
160+
k8s.io/cluster-bootstrap v0.25.12 // indirect
161+
k8s.io/code-generator v0.25.12 // indirect
162+
k8s.io/component-base v0.25.12 // indirect
162163
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
163-
k8s.io/klog/v2 v2.60.1 // indirect
164-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
165-
k8s.io/metrics v0.24.16 // indirect
166-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
164+
k8s.io/klog/v2 v2.70.1 // indirect
165+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
166+
k8s.io/metrics v0.25.12 // indirect
167+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
167168
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
168-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
169+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
169170
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
170171
)

0 commit comments

Comments
 (0)