Merge pull request #894 from dghubble/kubernetes-v1.9.3

Update hyperkube image from v1.9.2 to v1.9.3
kubernetes-retired · Feb 16, 2018 · 1960a0e · 1960a0e
2 parents 5120526 + fbc11c2
commit 1960a0e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -8,6 +8,7 @@ LOCAL_OS:=$(shell uname | tr A-Z a-z)
 GOFILES:=$(shell find . -name '*.go' | grep -v -E '(./vendor)')
 GOPATH_BIN:=$(shell echo ${GOPATH} | awk 'BEGIN { FS = ":" }; { print $1 }')/bin
 LDFLAGS=-X github.com/kubernetes-incubator/bootkube/pkg/version.Version=$(shell $(CURDIR)/build/git-version.sh)
+TERRAFORM:=$(shell command -v terraform 2> /dev/null)
 
 all: \
 	_output/bin/$(LOCAL_OS)/bootkube \
@@ -31,7 +32,11 @@ release: \
 
 check:
 	@gofmt -l -s $(GOFILES) | read; if [ $$? == 0 ]; then gofmt -s -d $(GOFILES); exit 1; fi
-	@terraform fmt -check ; if [ ! $$? -eq 0 ]; then exit 1; fi
+ifdef TERRAFORM
+	$(TERRAFORM) fmt -check ; if [ ! $$? -eq 0 ]; then exit 1; fi
+else
+	@echo -e "\e[91mSkipping terraform lint. terraform binary not available.\e[0m"
+endif
 	@go vet $(shell go list ./... | grep -v '/vendor/')
 	@./scripts/verify-gopkg.sh
 	@go test -v $(shell go list ./... | grep -v '/vendor/\|/e2e')

diff --git a/hack/multi-node/user-data.sample b/hack/multi-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.9.2
+        Environment=KUBELET_IMAGE_TAG=v1.9.3
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

diff --git a/hack/quickstart/kubelet.master b/hack/quickstart/kubelet.master
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.9.2
+Environment=KUBELET_IMAGE_TAG=v1.9.3
 Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

diff --git a/hack/quickstart/kubelet.worker b/hack/quickstart/kubelet.worker
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.9.2
+Environment=KUBELET_IMAGE_TAG=v1.9.3
 Environment=KUBELET_MINIMUM_CONTAINER_TTL_DURATION=3m0s
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS=-1
 Environment=KUBELET_MAXIMUM_DEAD_CONTAINERS_PER_CONTAINER=1

diff --git a/hack/single-node/user-data.sample b/hack/single-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.9.2
+        Environment=KUBELET_IMAGE_TAG=v1.9.3
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet \

diff --git a/hack/tests/conformance-test.sh b/hack/tests/conformance-test.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.9.2}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.9.3}
 
 usage() {
     echo "USAGE:"

diff --git a/pkg/asset/images.go b/pkg/asset/images.go
@@ -7,7 +7,7 @@ var DefaultImages = ImageVersions{
 	FlannelCNI:      "quay.io/coreos/flannel-cni:v0.3.0",
 	Calico:          "quay.io/calico/node:v2.6.6",
 	CalicoCNI:       "quay.io/calico/cni:v1.11.2",
-	Hyperkube:       "gcr.io/google_containers/hyperkube:v1.9.2",
+	Hyperkube:       "gcr.io/google_containers/hyperkube:v1.9.3",
 	KubeDNS:         "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8",
 	KubeDNSMasq:     "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8",
 	KubeDNSSidecar:  "gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8",