Skip to content

Commit 0beb061

Browse files
authored
[Maintenance] Update Go & K8S Versions (#1406)
1 parent 6e2ff83 commit 0beb061

File tree

7 files changed

+40
-366
lines changed

7 files changed

+40
-366
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: go
22

3+
git:
4+
depth: false
5+
36
go:
47
- "1.19"
58
- "1.20"
@@ -11,6 +14,7 @@ env:
1114

1215
script:
1316
- |
17+
set -e
1418
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ ! -z "$ALWAYS" ]; then
1519
make init
1620
make license-verify license-range-verify fmt-verify linter

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifeq ($(shell uname),Darwin)
1010
endif
1111

1212
KUBERNETES_VERSION_MINOR:=25
13-
KUBERNETES_VERSION_PATCH:=12
13+
KUBERNETES_VERSION_PATCH:=13
1414

1515
PROJECT := arangodb_operator
1616
SCRIPTDIR := $(shell pwd)
@@ -48,7 +48,7 @@ endif
4848

4949
TEST_BUILD ?= 0
5050
GOBUILDARGS ?=
51-
GOBASEVERSION := 1.19
51+
GOBASEVERSION := 1.20.8
5252
GOVERSION := $(GOBASEVERSION)-alpine3.17
5353
DISTRIBUTION := alpine:3.15
5454
GOBUILDTAGS := $(RELEASE_MODE)

go.mod

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

2525
require (
@@ -41,6 +41,7 @@ require (
4141
github.com/prometheus-operator/prometheus-operator/pkg/client v0.0.0-00010101000000-000000000000
4242
github.com/prometheus/client_golang v1.15.1
4343
github.com/prometheus/client_model v0.4.0
44+
github.com/prometheus/prom2json v1.3.3
4445
github.com/robfig/cron v1.2.0
4546
github.com/rs/zerolog v1.19.0
4647
github.com/spf13/cobra v1.4.0
@@ -53,35 +54,25 @@ require (
5354
google.golang.org/grpc v1.53.0
5455
google.golang.org/protobuf v1.30.0
5556
gopkg.in/yaml.v3 v3.0.1
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
57+
k8s.io/api v0.25.13
58+
k8s.io/apiextensions-apiserver v0.25.13
59+
k8s.io/apimachinery v0.25.13
60+
k8s.io/client-go v0.25.13
6061
sigs.k8s.io/yaml v1.2.0
6162
)
6263

6364
require (
64-
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-20220418222510-f25a4f6275ed // indirect
6867
github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
69-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
7068
github.com/beorn7/perks v1.0.1 // indirect
71-
github.com/blang/semver v3.5.1+incompatible // indirect
72-
github.com/blang/semver/v4 v4.0.0 // indirect
7369
github.com/bytedance/sonic v1.9.1 // indirect
7470
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
7571
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7672
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
77-
github.com/coreos/go-semver v0.3.0 // indirect
78-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
7973
github.com/davecgh/go-spew v1.1.1 // indirect
80-
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
8174
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
8275
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
83-
github.com/felixge/httpsnoop v1.0.1 // indirect
84-
github.com/fsnotify/fsnotify v1.4.9 // indirect
8576
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
8677
github.com/gin-contrib/sse v0.1.0 // indirect
8778
github.com/go-logr/logr v1.2.3 // indirect
@@ -95,14 +86,10 @@ require (
9586
github.com/gogo/protobuf v1.3.2 // indirect
9687
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9788
github.com/golang/protobuf v1.5.3 // indirect
98-
github.com/google/cel-go v0.12.6 // indirect
9989
github.com/google/gnostic v0.5.7-v3refs // indirect
10090
github.com/google/go-cmp v0.5.9 // indirect
10191
github.com/google/gofuzz v1.1.0 // indirect
10292
github.com/google/uuid v1.3.0 // indirect
103-
github.com/googleapis/gnostic v0.5.5 // indirect
104-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
105-
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
10693
github.com/imdario/mergo v0.3.6 // indirect
10794
github.com/inconshreveable/mousetrap v1.0.0 // indirect
10895
github.com/josharian/intern v1.0.0 // indirect
@@ -112,7 +99,6 @@ require (
11299
github.com/mailru/easyjson v0.7.7 // indirect
113100
github.com/mattn/go-isatty v0.0.19 // indirect
114101
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
115-
github.com/mitchellh/mapstructure v1.4.1 // indirect
116102
github.com/moby/spdystream v0.2.0 // indirect
117103
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
118104
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -122,51 +108,21 @@ require (
122108
github.com/pmezard/go-difflib v1.0.0 // indirect
123109
github.com/prometheus/common v0.44.0 // indirect
124110
github.com/prometheus/procfs v0.9.0 // indirect
125-
github.com/prometheus/prom2json v1.3.3 // indirect
126-
github.com/stoewer/go-strcase v1.2.0 // indirect
127111
github.com/stretchr/objx v0.2.0 // indirect
128112
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
129113
github.com/ugorji/go/codec v1.2.11 // indirect
130-
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
131-
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
132-
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
133-
go.opentelemetry.io/contrib v0.20.0 // indirect
134-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
135-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
136-
go.opentelemetry.io/otel v0.20.0 // indirect
137-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
138-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
139-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
140-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
141-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
142-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
143-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
144-
go.uber.org/atomic v1.7.0 // indirect
145-
go.uber.org/multierr v1.6.0 // indirect
146-
go.uber.org/zap v1.19.0 // indirect
147114
golang.org/x/arch v0.3.0 // indirect
148115
golang.org/x/crypto v0.11.0 // indirect
149-
golang.org/x/mod v0.8.0 // indirect
150116
golang.org/x/net v0.13.0 // indirect
151117
golang.org/x/oauth2 v0.8.0 // indirect
152118
golang.org/x/term v0.10.0 // indirect
153-
golang.org/x/tools v0.6.0 // indirect
154119
google.golang.org/appengine v1.6.7 // indirect
155120
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
156121
gopkg.in/inf.v0 v0.9.1 // indirect
157-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
158122
gopkg.in/yaml.v2 v2.4.0 // indirect
159-
k8s.io/apiserver v0.25.12 // indirect
160-
k8s.io/cloud-provider v0.25.12 // indirect
161-
k8s.io/cluster-bootstrap v0.25.12 // indirect
162-
k8s.io/code-generator v0.25.12 // indirect
163-
k8s.io/component-base v0.25.12 // indirect
164-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
165123
k8s.io/klog/v2 v2.70.1 // indirect
166124
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
167-
k8s.io/metrics v0.25.12 // indirect
168125
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
169-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
170126
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
171127
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
172128
)

0 commit comments

Comments
 (0)