Skip to content

Commit 3fcbf0c

Browse files
author
chusAlvarez
authored
Merge pull request #81 from spotahome/update-kubernetes-1.15.6
change kubernetes and kind versions
2 parents dad6b4e + 7186a0c commit 3fcbf0c

File tree

5 files changed

+219
-43
lines changed

5 files changed

+219
-43
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ script:
1717
env:
1818
global:
1919
- GO111MODULE=on
20-
- KIND_VERSION=v0.6.0
21-
- KUBERNETES_VERSION=1.14.9
20+
- KIND_VERSION=v0.6.1
21+
- KUBERNETES_VERSION=1.15.6

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN_EXAMPLE_POD_ECHO := go run ./examples/echo-pod-controller/cmd/* --developmen
2727
RUN_EXAMPLE_POD_ECHO_ONEFILE := go run ./examples/onefile-echo-pod-controller/main.go --development
2828
RUN_EXAMPLE_POD_TERM := go run ./examples/pod-terminator-operator/cmd/* --development
2929
DEPS_CMD := GO111MODULE=on go mod tidy && GO111MODULE=on go mod vendor
30-
K8S_VERSION := "1.14.9"
30+
K8S_VERSION := "1.15.6"
3131
SET_K8S_DEPS_CMD := GO111MODULE=on go mod edit \
3232
-require=k8s.io/apiextensions-apiserver@kubernetes-${K8S_VERSION} \
3333
-require=k8s.io/client-go@kubernetes-${K8S_VERSION} \

‎go.mod

+66-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,68 @@
11
module github.com/spotahome/kooper
22

3+
// Dependencies we don't really need, except that kubernetes specifies them as v0.0.0 which confuses go.mod
4+
//replace k8s.io/apiserver => k8s.io/apiserver kubernetes-1.15.6
5+
//replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.15.6
6+
//replace k8s.io/api => k8s.io/api kubernetes-1.15.6
7+
//replace k8s.io/component-base => k8s.io/component-base kubernetes-1.15.6
8+
//replace k8s.io/client-go => k8s.io/client-go kubernetes-1.15.6
9+
//replace k8s.io/kube-scheduler => k8s.io/kube-scheduler kubernetes-1.15.6
10+
//replace k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.15.6
11+
//replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers kubernetes-1.15.6
12+
//replace k8s.io/kubelet => k8s.io/kubelet kubernetes-1.15.6
13+
//replace k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.15.6
14+
//replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib kubernetes-1.15.6
15+
//replace k8s.io/cli-runtime => k8s.io/cli-runtime kubernetes-1.15.6
16+
//replace k8s.io/kube-aggregator => k8s.io/kube-aggregator kubernetes-1.15.6
17+
//replace k8s.io/sample-apiserver => k8s.io/sample-apiserver kubernetes-1.15.6
18+
//replace k8s.io/metrics => k8s.io/metrics kubernetes-1.15.6
19+
//replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap kubernetes-1.15.6
20+
//replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager kubernetes-1.15.6
21+
//replace k8s.io/kube-proxy => k8s.io/kube-proxy kubernetes-1.15.6
22+
//replace k8s.io/cri-api => k8s.io/cri-api kubernetes-1.15.6
23+
//replace k8s.io/code-generator => k8s.io/code-generator kubernetes-1.15.6
24+
25+
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191114102923-bf973bc1a46c
26+
27+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191114105316-e8706470940d
28+
29+
replace k8s.io/api => k8s.io/api v0.0.0-20191114100237-2cd11237263f
30+
31+
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20191114102239-843ff05e8ff4
32+
33+
replace k8s.io/client-go => k8s.io/client-go v0.0.0-20191114101336-8cba805ad12d
34+
35+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191114111147-29226eb67741
36+
37+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115701-31ade1b30762
38+
39+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191114112557-fb8eac6d1d79
40+
41+
replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191114110913-8a0729368279
42+
43+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191114111940-b2efa58ca04c
44+
45+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191114112225-e438b10da852
46+
47+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191114110057-22fabc8113ba
48+
49+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191114103707-3917fe134eab
50+
51+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191114104325-4dc280b03897
52+
53+
replace k8s.io/metrics => k8s.io/metrics v0.0.0-20191114105745-bf91bab17669
54+
55+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191114111701-466976f32df4
56+
57+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191114111427-e269b4a0667c
58+
59+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191114110636-5b9a03eee945
60+
61+
replace k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
62+
63+
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
64+
365
require (
4-
github.com/766b/go-outliner v0.0.0-20180511142203-fc6edecdadd7 // indirect
5-
github.com/Azure/go-autorest/autorest v0.9.1 // indirect
6-
github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect
766
github.com/Pallinder/go-randomdata v0.0.0-20180329154440-dab270d296c6
867
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
968
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
@@ -14,7 +73,6 @@ require (
1473
github.com/hashicorp/golang-lru v0.5.3 // indirect
1574
github.com/imdario/mergo v0.3.7 // indirect
1675
github.com/opentracing/opentracing-go v1.1.0
17-
github.com/pborman/uuid v1.2.0 // indirect
1876
github.com/prometheus/client_golang v1.1.0
1977
github.com/spf13/pflag v1.0.5 // indirect
2078
github.com/stretchr/testify v1.4.0
@@ -26,10 +84,10 @@ require (
2684
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
2785
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
2886
gopkg.in/inf.v0 v0.9.1 // indirect
29-
k8s.io/api v0.0.0-20191004102349-159aefb8556b
30-
k8s.io/apiextensions-apiserver v0.0.0-20191114015135-f299f23b335b
31-
k8s.io/apimachinery v0.0.0-20191004074956-c5d2f014d689
32-
k8s.io/client-go v11.0.1-0.20191029005444-8e4128053008+incompatible
87+
k8s.io/api v0.0.0
88+
k8s.io/apiextensions-apiserver v0.0.0
89+
k8s.io/apimachinery v0.0.0
90+
k8s.io/client-go v0.0.0
3391
k8s.io/klog v1.0.0 // indirect
3492
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d // indirect
3593
k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect

0 commit comments

Comments
 (0)