Skip to content

Commit 2ff32f1

Browse files
authored
Gopkg.*,pkg/generator/templates.go: update to kubernetes 1.10.1 (#383)
* Gopkg.*,pkg/generator/templates.go: update to kubernetes 1.10.1 This doesn't require any changes to the code and allows us to experiment with the controller-runtime. * .travis.yml: update ci tests to use kubernetes 1.10.1 * .travis.yml: pin to old version of minikube Minikube requires systemd with version v0.26.0 and travis does not provide it, so we currently need to stick to an older version * .travis.yml: use kuberenetes 1.10.0 for minikube Our version of minikube only supports up to 1.10.0
1 parent ff510f4 commit 2ff32f1

File tree

4 files changed

+37
-120
lines changed

4 files changed

+37
-120
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ before_script:
1515
- go get -u github.com/golang/dep/cmd/dep
1616
- dep ensure
1717
# Download kubectl, which is a requirement for using minikube.
18-
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
18+
- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.10.1/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
1919
# Download minikube.
20+
# We need to pin to an old version due to minikube requiring systemd starting with v0.26.0 and travis not providing it
21+
# - https://github.com/kubernetes/minikube/issues/2704
2022
- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.2/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
21-
- sudo minikube start --vm-driver=none --kubernetes-version=v1.9.0
23+
- sudo minikube start --vm-driver=none --kubernetes-version=v1.10.0
2224
# Fix the kubectl context, as it's often stale.
2325
- minikube update-context
2426
# Wait for Kubernetes to be up and ready.

Gopkg.lock

Lines changed: 21 additions & 106 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88

99
[[override]]
1010
name = "k8s.io/api"
11-
version = "kubernetes-1.9.3"
11+
version = "kubernetes-1.10.1"
1212

1313
[[override]]
1414
name = "k8s.io/apimachinery"
15-
version = "kubernetes-1.9.3"
15+
version = "kubernetes-1.10.1"
1616

1717
[[override]]
1818
name = "k8s.io/apiextensions-apiserver"
19-
version = "kubernetes-1.9.3"
19+
version = "kubernetes-1.10.1"
2020

2121
[[override]]
2222
name = "k8s.io/client-go"
23-
version = "kubernetes-1.9.3"
23+
version = "kubernetes-1.10.1"
2424

2525
[[constraint]]
2626
name = "github.com/sergi/go-diff"

pkg/generator/templates.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,23 +254,23 @@ required = [
254254
255255
[[override]]
256256
name = "k8s.io/code-generator"
257-
# revision for tag "kubernetes-1.9.3"
258-
revision = "91d3f6a57905178524105a085085901bb73bd3dc"
257+
# revision for tag "kubernetes-1.10.1"
258+
revision = "7ead8f38b01cf8653249f5af80ce7b2c8aba12e2"
259259
260260
[[override]]
261261
name = "k8s.io/api"
262-
# revision for tag "kubernetes-1.9.3"
263-
revision = "acf347b865f29325eb61f4cd2df11e86e073a5ee"
262+
# revision for tag "kubernetes-1.10.1"
263+
revision = "73d903622b7391f3312dcbac6483fed484e185f8"
264264
265265
[[override]]
266266
name = "k8s.io/apimachinery"
267-
# revision for tag "kubernetes-1.9.3"
268-
revision = "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
267+
# revision for tag "kubernetes-1.10.1"
268+
revision = "302974c03f7e50f16561ba237db776ab93594ef6"
269269
270270
[[override]]
271271
name = "k8s.io/client-go"
272-
# revision for tag "kubernetes-1.9.3"
273-
revision = "9389c055a838d4f208b699b3c7c51b70f2368861"
272+
# revision for tag "kubernetes-1.10.1"
273+
revision = "989be4278f353e42f26c416c53757d16fcff77db"
274274
275275
[[constraint]]
276276
name = "github.com/operator-framework/operator-sdk"

0 commit comments

Comments
 (0)