Skip to content

Commit

Permalink
Merge pull request #81 from spotahome/update-kubernetes-1.15.6
Browse files Browse the repository at this point in the history
change kubernetes and kind versions
  • Loading branch information
chusAlvarez authored Dec 11, 2019
2 parents dad6b4e + 7186a0c commit 3fcbf0c
Show file tree
Hide file tree
Showing 5 changed files with 219 additions and 43 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ script:
env:
global:
- GO111MODULE=on
- KIND_VERSION=v0.6.0
- KUBERNETES_VERSION=1.14.9
- KIND_VERSION=v0.6.1
- KUBERNETES_VERSION=1.15.6
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN_EXAMPLE_POD_ECHO := go run ./examples/echo-pod-controller/cmd/* --developmen
RUN_EXAMPLE_POD_ECHO_ONEFILE := go run ./examples/onefile-echo-pod-controller/main.go --development
RUN_EXAMPLE_POD_TERM := go run ./examples/pod-terminator-operator/cmd/* --development
DEPS_CMD := GO111MODULE=on go mod tidy && GO111MODULE=on go mod vendor
K8S_VERSION := "1.14.9"
K8S_VERSION := "1.15.6"
SET_K8S_DEPS_CMD := GO111MODULE=on go mod edit \
-require=k8s.io/apiextensions-apiserver@kubernetes-${K8S_VERSION} \
-require=k8s.io/client-go@kubernetes-${K8S_VERSION} \
Expand Down
74 changes: 66 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,68 @@
module github.com/spotahome/kooper

// Dependencies we don't really need, except that kubernetes specifies them as v0.0.0 which confuses go.mod
//replace k8s.io/apiserver => k8s.io/apiserver kubernetes-1.15.6
//replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.15.6
//replace k8s.io/api => k8s.io/api kubernetes-1.15.6
//replace k8s.io/component-base => k8s.io/component-base kubernetes-1.15.6
//replace k8s.io/client-go => k8s.io/client-go kubernetes-1.15.6
//replace k8s.io/kube-scheduler => k8s.io/kube-scheduler kubernetes-1.15.6
//replace k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.15.6
//replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers kubernetes-1.15.6
//replace k8s.io/kubelet => k8s.io/kubelet kubernetes-1.15.6
//replace k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.15.6
//replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib kubernetes-1.15.6
//replace k8s.io/cli-runtime => k8s.io/cli-runtime kubernetes-1.15.6
//replace k8s.io/kube-aggregator => k8s.io/kube-aggregator kubernetes-1.15.6
//replace k8s.io/sample-apiserver => k8s.io/sample-apiserver kubernetes-1.15.6
//replace k8s.io/metrics => k8s.io/metrics kubernetes-1.15.6
//replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap kubernetes-1.15.6
//replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager kubernetes-1.15.6
//replace k8s.io/kube-proxy => k8s.io/kube-proxy kubernetes-1.15.6
//replace k8s.io/cri-api => k8s.io/cri-api kubernetes-1.15.6
//replace k8s.io/code-generator => k8s.io/code-generator kubernetes-1.15.6

replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191114102923-bf973bc1a46c

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191114105316-e8706470940d

replace k8s.io/api => k8s.io/api v0.0.0-20191114100237-2cd11237263f

replace k8s.io/component-base => k8s.io/component-base v0.0.0-20191114102239-843ff05e8ff4

replace k8s.io/client-go => k8s.io/client-go v0.0.0-20191114101336-8cba805ad12d

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191114111147-29226eb67741

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191114112557-fb8eac6d1d79

replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191114110913-8a0729368279

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191114111940-b2efa58ca04c

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191114112225-e438b10da852

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191114110057-22fabc8113ba

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191114103707-3917fe134eab

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191114104325-4dc280b03897

replace k8s.io/metrics => k8s.io/metrics v0.0.0-20191114105745-bf91bab17669

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191114111701-466976f32df4

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191114111427-e269b4a0667c

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191114110636-5b9a03eee945

replace k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79

replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b

require (
github.com/766b/go-outliner v0.0.0-20180511142203-fc6edecdadd7 // indirect
github.com/Azure/go-autorest/autorest v0.9.1 // indirect
github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect
github.com/Pallinder/go-randomdata v0.0.0-20180329154440-dab270d296c6
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
Expand All @@ -14,7 +73,6 @@ require (
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/opentracing/opentracing-go v1.1.0
github.com/pborman/uuid v1.2.0 // indirect
github.com/prometheus/client_golang v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.4.0
Expand All @@ -26,10 +84,10 @@ require (
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.0.0-20191004102349-159aefb8556b
k8s.io/apiextensions-apiserver v0.0.0-20191114015135-f299f23b335b
k8s.io/apimachinery v0.0.0-20191004074956-c5d2f014d689
k8s.io/client-go v11.0.1-0.20191029005444-8e4128053008+incompatible
k8s.io/api v0.0.0
k8s.io/apiextensions-apiserver v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d // indirect
k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect
Expand Down
Loading

0 comments on commit 3fcbf0c

Please sign in to comment.