Skip to content

Commit

Permalink
protokube / nodeup: Up kubectl to v1.5.1, bump protokube tag to 1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zmerlynn committed Dec 27, 2016
1 parent 23d44f7 commit 91dc93a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))

# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.4.1
PROTOKUBE_TAG=1.4.1
PROTOKUBE_TAG=1.5.0

ifndef VERSION
VERSION := git-$(shell git describe --always)
Expand Down
2 changes: 1 addition & 1 deletion images/protokube-builder/onbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ cp /go/bin/channels /src/.build/artifacts/

# channels uses protokube
cd /src/.build/artifacts/
curl -O https://storage.googleapis.com/kubernetes-release/release/v1.3.7/bin/linux/amd64/kubectl
curl -O https://storage.googleapis.com/kubernetes-release/release/v1.5.1/bin/linux/amd64/kubectl
chmod +x kubectl
2 changes: 1 addition & 1 deletion upup/pkg/fi/nodeup/template_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (

const TagMaster = "_kubernetes_master"

const DefaultProtokubeImage = "b.gcr.io/kops-images/protokube:1.4.1"
const DefaultProtokubeImage = "b.gcr.io/kops-images/protokube:1.5.0"

// templateFunctions is a simple helper-class for the functions accessible to templates
type templateFunctions struct {
Expand Down

0 comments on commit 91dc93a

Please sign in to comment.