Skip to content

[Feature] Switch k8s to 1.19 #701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 23, 2021
Merged

[Feature] Switch k8s to 1.19 #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e56daec
Switch k8s to 1.19
ajanikow Mar 16, 2021
aa65666
Format
ajanikow Mar 23, 2021
6fa87de
Changelog
ajanikow Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Change Log

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

## [1.1.6](https://github.com/arangodb/kube-arangodb/tree/1.1.6) (2021-03-02)
- Add ArangoMember Resource and required RBAC rules
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ endif
.PHONY: update-vendor
update-vendor:
@rm -Rf $(VENDORDIR)/k8s.io/code-generator
@git clone --branch kubernetes-1.16.15 https://github.com/kubernetes/code-generator.git $(VENDORDIR)/k8s.io/code-generator
@git clone --branch kubernetes-1.19.8 https://github.com/kubernetes/code-generator.git $(VENDORDIR)/k8s.io/code-generator
@rm -Rf $(VENDORDIR)/k8s.io/code-generator/.git


Expand Down
50 changes: 26 additions & 24 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,22 @@ go 1.13

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

k8s.io/api => k8s.io/api v0.16.15
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.15
k8s.io/apimachinery => k8s.io/apimachinery v0.16.15
k8s.io/apiserver => k8s.io/apiserver v0.16.15
k8s.io/client-go => k8s.io/client-go v0.16.15
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.15
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.15
k8s.io/api => k8s.io/api v0.19.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.8
k8s.io/apimachinery => k8s.io/apimachinery v0.19.8
k8s.io/apiserver => k8s.io/apiserver v0.19.8
k8s.io/client-go => k8s.io/client-go v0.19.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.8
k8s.io/code-generator => ./deps/k8s.io/code-generator
k8s.io/component-base => k8s.io/component-base v0.16.15
k8s.io/kubernetes => k8s.io/kubernetes v0.16.15
k8s.io/metrics => k8s.io/metrics v0.16.15
k8s.io/component-base => k8s.io/component-base v0.19.8
k8s.io/kubernetes => k8s.io/kubernetes v0.19.8
k8s.io/metrics => k8s.io/metrics v0.19.8
)

require (
Expand All @@ -28,37 +29,38 @@ require (
github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21
github.com/cenkalti/backoff v2.1.1+incompatible
github.com/coreos/go-semver v0.3.0
github.com/coreos/prometheus-operator v0.37.0
github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/evanphx/json-patch v4.9.0+incompatible
github.com/ghodss/yaml v1.0.0
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
github.com/gin-gonic/gin v1.3.0
github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/jessevdk/go-assets v0.0.0-20160921144138-4f4301a06e15
github.com/jessevdk/go-assets-builder v0.0.0-20130903091706-b8483521738f
github.com/jessevdk/go-flags v1.4.0 // indirect
github.com/julienschmidt/httprouter v1.3.0
github.com/magiconair/properties v1.8.0
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v1.2.1
github.com/onsi/gomega v1.7.1 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.44.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.0.0-00010101000000-000000000000
github.com/prometheus/client_golang v1.7.1
github.com/robfig/cron v1.2.0
github.com/rs/zerolog v1.14.3
github.com/spf13/cobra v0.0.5
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 // indirect
golang.org/x/mod v0.4.1 // indirect
golang.org/x/net v0.0.0-20201021035429-f5854403a974
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210223085322-b80eb88b80d2
golang.org/x/tools v0.1.0 // indirect
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
k8s.io/api v0.17.3
k8s.io/apiextensions-apiserver v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/api v0.19.8
k8s.io/apiextensions-apiserver v0.18.3
k8s.io/apimachinery v0.19.8
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog v1.0.0
)
Loading