Skip to content

Commit 73d178e

Browse files
authored
[Feature] Switch k8s to 1.19 (#701)
1 parent c65c909 commit 73d178e

File tree

173 files changed

+1389
-1788
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+1389
-1788
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Change Log
22

33
## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
4+
- Bump Kubernetes Dependencies to 1.19.x
45

56
## [1.1.6](https://github.com/arangodb/kube-arangodb/tree/1.1.6) (2021-03-02)
67
- Add ArangoMember Resource and required RBAC rules

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ endif
229229
.PHONY: update-vendor
230230
update-vendor:
231231
@rm -Rf $(VENDORDIR)/k8s.io/code-generator
232-
@git clone --branch kubernetes-1.16.15 https://github.com/kubernetes/code-generator.git $(VENDORDIR)/k8s.io/code-generator
232+
@git clone --branch kubernetes-1.19.8 https://github.com/kubernetes/code-generator.git $(VENDORDIR)/k8s.io/code-generator
233233
@rm -Rf $(VENDORDIR)/k8s.io/code-generator/.git
234234

235235

go.mod

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ go 1.13
44

55
replace (
66
github.com/arangodb/go-driver => github.com/arangodb/go-driver v0.0.0-20200617115956-9dac4c7fed22
7-
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.37.0
7+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.46.0
8+
github.com/prometheus-operator/prometheus-operator/pkg/client => github.com/prometheus-operator/prometheus-operator/pkg/client v0.46.0
89
github.com/stretchr/testify => github.com/stretchr/testify v1.5.1
910
github.com/ugorji/go => github.com/ugorji/go v0.0.0-20181209151446-772ced7fd4c2
1011

11-
k8s.io/api => k8s.io/api v0.16.15
12-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.15
13-
k8s.io/apimachinery => k8s.io/apimachinery v0.16.15
14-
k8s.io/apiserver => k8s.io/apiserver v0.16.15
15-
k8s.io/client-go => k8s.io/client-go v0.16.15
16-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.15
17-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.15
12+
k8s.io/api => k8s.io/api v0.19.8
13+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.8
14+
k8s.io/apimachinery => k8s.io/apimachinery v0.19.8
15+
k8s.io/apiserver => k8s.io/apiserver v0.19.8
16+
k8s.io/client-go => k8s.io/client-go v0.19.8
17+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.8
18+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.8
1819
k8s.io/code-generator => ./deps/k8s.io/code-generator
19-
k8s.io/component-base => k8s.io/component-base v0.16.15
20-
k8s.io/kubernetes => k8s.io/kubernetes v0.16.15
21-
k8s.io/metrics => k8s.io/metrics v0.16.15
20+
k8s.io/component-base => k8s.io/component-base v0.19.8
21+
k8s.io/kubernetes => k8s.io/kubernetes v0.19.8
22+
k8s.io/metrics => k8s.io/metrics v0.19.8
2223
)
2324

2425
require (
@@ -28,37 +29,38 @@ require (
2829
github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21
2930
github.com/cenkalti/backoff v2.1.1+incompatible
3031
github.com/coreos/go-semver v0.3.0
31-
github.com/coreos/prometheus-operator v0.37.0
3232
github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
3333
github.com/dgrijalva/jwt-go v3.2.0+incompatible
3434
github.com/evanphx/json-patch v4.9.0+incompatible
3535
github.com/ghodss/yaml v1.0.0
3636
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
3737
github.com/gin-gonic/gin v1.3.0
38-
github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76 // indirect
38+
github.com/hashicorp/golang-lru v0.5.3 // indirect
3939
github.com/jessevdk/go-assets v0.0.0-20160921144138-4f4301a06e15
4040
github.com/jessevdk/go-assets-builder v0.0.0-20130903091706-b8483521738f
41+
github.com/jessevdk/go-flags v1.4.0 // indirect
4142
github.com/julienschmidt/httprouter v1.3.0
4243
github.com/magiconair/properties v1.8.0
4344
github.com/mattn/go-isatty v0.0.12 // indirect
44-
github.com/pkg/errors v0.8.1
45-
github.com/prometheus/client_golang v1.2.1
45+
github.com/onsi/gomega v1.7.1 // indirect
46+
github.com/pkg/errors v0.9.1
47+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.44.1
48+
github.com/prometheus-operator/prometheus-operator/pkg/client v0.0.0-00010101000000-000000000000
49+
github.com/prometheus/client_golang v1.7.1
4650
github.com/robfig/cron v1.2.0
4751
github.com/rs/zerolog v1.14.3
48-
github.com/spf13/cobra v0.0.5
52+
github.com/spf13/cobra v1.0.0
4953
github.com/spf13/pflag v1.0.5
5054
github.com/stretchr/testify v1.5.1
5155
github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 // indirect
52-
golang.org/x/mod v0.4.1 // indirect
53-
golang.org/x/net v0.0.0-20201021035429-f5854403a974
54-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
55-
golang.org/x/sys v0.0.0-20210223085322-b80eb88b80d2
56-
golang.org/x/tools v0.1.0 // indirect
56+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
57+
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
58+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
5759
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
5860
gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
59-
k8s.io/api v0.17.3
60-
k8s.io/apiextensions-apiserver v0.17.3
61-
k8s.io/apimachinery v0.17.3
61+
k8s.io/api v0.19.8
62+
k8s.io/apiextensions-apiserver v0.18.3
63+
k8s.io/apimachinery v0.19.8
6264
k8s.io/client-go v12.0.0+incompatible
6365
k8s.io/klog v1.0.0
6466
)

0 commit comments

Comments
 (0)