Skip to content

Commit 3661886

Browse files
ajanikowajanikow
authored
[Feature] Bump K8S Version to 1.23.17 (#1369)
1 parent 647f2aa commit 3661886

29 files changed

+412
-72
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- (Bugfix) Skip Collection check for missing Database
99
- (Feature) Abort resignation of leadership when DB server is restared
1010
- (Feature) Numactl Options
11+
- (Maintenance) Bump K8S Version to 1.23.17
1112

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

‎Makefile‎

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

12+
KUBERNETES_VERSION_MINOR:=23
13+
KUBERNETES_VERSION_PATCH:=17
14+
1215
PROJECT := arangodb_operator
1316
SCRIPTDIR := $(shell pwd)
1417
ROOTDIR := $(shell cd $(SCRIPTDIR) && pwd)
@@ -301,10 +304,40 @@ ifndef DOCKERNAMESPACE
301304
endif
302305
@echo "Using docker namespace: $(DOCKERNAMESPACE)"
303306

307+
KUBERNETES_APIS := k8s.io/api \
308+
k8s.io/apiextensions-apiserver \
309+
k8s.io/apimachinery \
310+
k8s.io/apiserver \
311+
k8s.io/client-go \
312+
k8s.io/cloud-provider \
313+
k8s.io/cluster-bootstrap \
314+
k8s.io/code-generator \
315+
k8s.io/component-base \
316+
k8s.io/kubernetes \
317+
k8s.io/metrics
318+
319+
KUBERNETES_MODS := k8s.io/api \
320+
k8s.io/apiextensions-apiserver \
321+
k8s.io/apimachinery \
322+
k8s.io/apiserver \
323+
k8s.io/client-go \
324+
k8s.io/cloud-provider \
325+
k8s.io/cluster-bootstrap \
326+
k8s.io/code-generator \
327+
k8s.io/component-base \
328+
k8s.io/metrics
329+
330+
.PHONY: update-kubernetes-version
331+
update-kubernetes-version:
332+
@$(foreach API,$(KUBERNETES_APIS), sed -i 's#$(API) => $(API) .*#$(API) => $(API) v0.$(KUBERNETES_VERSION_MINOR).$(KUBERNETES_VERSION_PATCH)#g' '$(ROOT)/go.mod' &&) echo "Replaced to K8S 1.$(KUBERNETES_VERSION_MINOR).$(KUBERNETES_VERSION_PATCH)"
333+
334+
update-kubernetes-version-go:
335+
@$(foreach API,$(KUBERNETES_MODS), go get '$(API)@v0.$(KUBERNETES_VERSION_MINOR).$(KUBERNETES_VERSION_PATCH)' &&) echo "Go Upgraded to K8S 1.$(KUBERNETES_VERSION_MINOR).$(KUBERNETES_VERSION_PATCH)"
336+
304337
.PHONY: update-vendor
305338
update-vendor:
306339
@rm -Rf $(VENDORDIR)/k8s.io/code-generator
307-
@git clone --branch kubernetes-1.22.15 https://github.com/kubernetes/code-generator.git $(VENDORDIR)/k8s.io/code-generator
340+
@git clone --branch "kubernetes-1.$(KUBERNETES_VERSION_MINOR).$(KUBERNETES_VERSION_PATCH)" https://github.com/kubernetes/code-generator.git $(VENDORDIR)/k8s.io/code-generator
308341
@rm -Rf $(VENDORDIR)/k8s.io/code-generator/.git
309342

310343

‎go.mod‎

Lines changed: 69 additions & 22 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.22.15
13-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.15
14-
k8s.io/apimachinery => k8s.io/apimachinery v0.22.15
15-
k8s.io/apiserver => k8s.io/apiserver v0.22.15
16-
k8s.io/client-go => k8s.io/client-go v0.22.15
17-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.15
18-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.15
12+
k8s.io/api => k8s.io/api v0.23.17
13+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.17
14+
k8s.io/apimachinery => k8s.io/apimachinery v0.23.17
15+
k8s.io/apiserver => k8s.io/apiserver v0.23.17
16+
k8s.io/client-go => k8s.io/client-go v0.23.17
17+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.17
18+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.17
1919
k8s.io/code-generator => ./deps/k8s.io/code-generator
20-
k8s.io/component-base => k8s.io/component-base v0.22.15
21-
k8s.io/kubernetes => k8s.io/kubernetes v0.22.15
22-
k8s.io/metrics => k8s.io/metrics v0.22.15
20+
k8s.io/component-base => k8s.io/component-base v0.23.17
21+
k8s.io/kubernetes => k8s.io/kubernetes v0.23.17
22+
k8s.io/metrics => k8s.io/metrics v0.23.17
2323
)
2424

2525
require (
@@ -46,33 +46,45 @@ require (
4646
github.com/spf13/cobra v1.2.1
4747
github.com/spf13/pflag v1.0.5
4848
github.com/stretchr/testify v1.8.3
49-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
49+
golang.org/x/sync v0.1.0
5050
golang.org/x/sys v0.8.0
5151
golang.org/x/text v0.9.0
52-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
52+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
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.22.15
57-
k8s.io/apiextensions-apiserver v0.18.3
58-
k8s.io/apimachinery v0.22.15
59-
k8s.io/client-go v12.0.0+incompatible
56+
k8s.io/api v0.23.17
57+
k8s.io/apiextensions-apiserver v0.23.17
58+
k8s.io/apimachinery v0.23.17
59+
k8s.io/client-go v0.23.17
6060
sigs.k8s.io/yaml v1.2.0
6161
)
6262

6363
require (
64+
github.com/NYTimes/gziphandler v1.1.1 // indirect
65+
github.com/PuerkitoBio/purell v1.1.1 // indirect
66+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
67+
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect
6468
github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
69+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
6570
github.com/beorn7/perks v1.0.1 // indirect
71+
github.com/blang/semver v3.5.1+incompatible // indirect
6672
github.com/bytedance/sonic v1.9.1 // indirect
6773
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
6874
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6975
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
76+
github.com/coreos/go-semver v0.3.0 // indirect
77+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
7078
github.com/davecgh/go-spew v1.1.1 // indirect
71-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
79+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
80+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
81+
github.com/felixge/httpsnoop v1.0.1 // indirect
82+
github.com/fsnotify/fsnotify v1.4.9 // indirect
7283
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
7384
github.com/gin-contrib/sse v0.1.0 // indirect
74-
github.com/go-logr/logr v0.4.0 // indirect
85+
github.com/go-logr/logr v1.2.0 // indirect
7586
github.com/go-openapi/jsonpointer v0.19.5 // indirect
87+
github.com/go-openapi/jsonreference v0.19.5 // indirect
7688
github.com/go-openapi/swag v0.21.1 // indirect
7789
github.com/go-playground/locales v0.14.1 // indirect
7890
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -81,10 +93,13 @@ require (
8193
github.com/gogo/protobuf v1.3.2 // indirect
8294
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8395
github.com/golang/protobuf v1.5.2 // indirect
96+
github.com/google/cel-go v0.9.0 // indirect
8497
github.com/google/go-cmp v0.5.9 // indirect
8598
github.com/google/gofuzz v1.1.0 // indirect
8699
github.com/google/uuid v1.3.0 // indirect
87100
github.com/googleapis/gnostic v0.5.5 // indirect
101+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
102+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
88103
github.com/imdario/mergo v0.3.5 // indirect
89104
github.com/inconshreveable/mousetrap v1.0.0 // indirect
90105
github.com/josharian/intern v1.0.0 // indirect
@@ -94,28 +109,60 @@ require (
94109
github.com/mailru/easyjson v0.7.7 // indirect
95110
github.com/mattn/go-isatty v0.0.19 // indirect
96111
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
112+
github.com/mitchellh/mapstructure v1.4.1 // indirect
97113
github.com/moby/spdystream v0.2.0 // indirect
98114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
99115
github.com/modern-go/reflect2 v1.0.2 // indirect
116+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
100117
github.com/pavel-v-chernykh/keystore-go v2.1.0+incompatible // indirect
101118
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
102119
github.com/pmezard/go-difflib v1.0.0 // indirect
103-
github.com/prometheus/common v0.26.0 // indirect
120+
github.com/prometheus/common v0.28.0 // indirect
104121
github.com/prometheus/procfs v0.6.0 // indirect
122+
github.com/stoewer/go-strcase v1.2.0 // indirect
105123
github.com/stretchr/objx v0.2.0 // indirect
106124
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
107125
github.com/ugorji/go/codec v1.2.11 // indirect
126+
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
127+
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
128+
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
129+
go.opentelemetry.io/contrib v0.20.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
131+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
132+
go.opentelemetry.io/otel v0.20.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
134+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
135+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
136+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
137+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
138+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
139+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
140+
go.uber.org/atomic v1.7.0 // indirect
141+
go.uber.org/multierr v1.6.0 // indirect
142+
go.uber.org/zap v1.19.0 // indirect
108143
golang.org/x/arch v0.3.0 // indirect
109144
golang.org/x/crypto v0.9.0 // indirect
145+
golang.org/x/mod v0.8.0 // indirect
110146
golang.org/x/net v0.10.0 // indirect
111147
golang.org/x/oauth2 v0.4.0 // indirect
112148
golang.org/x/term v0.8.0 // indirect
149+
golang.org/x/tools v0.6.0 // indirect
113150
google.golang.org/appengine v1.6.7 // indirect
114151
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
115152
gopkg.in/inf.v0 v0.9.1 // indirect
153+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
116154
gopkg.in/yaml.v2 v2.4.0 // indirect
117-
k8s.io/klog/v2 v2.9.0 // indirect
118-
k8s.io/kube-openapi v0.0.0-20211110012726-3cc51fd1e909 // indirect
155+
k8s.io/apiserver v0.23.17 // indirect
156+
k8s.io/cloud-provider v0.23.17 // indirect
157+
k8s.io/cluster-bootstrap v0.23.17 // indirect
158+
k8s.io/code-generator v0.23.17 // indirect
159+
k8s.io/component-base v0.23.17 // indirect
160+
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
161+
k8s.io/klog/v2 v2.30.0 // indirect
162+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
163+
k8s.io/metrics v0.23.17 // indirect
119164
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
120-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
165+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
166+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
167+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
121168
)

0 commit comments

Comments
 (0)