From 07e22ca6edbe358c3ba5d36589db7bf07f3b1acb Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 13 Mar 2017 12:54:50 -0700 Subject: [PATCH] examples: Update static Kubernetes to v1.5.4 --- CHANGES.md | 2 +- Documentation/kubernetes.md | 2 +- Documentation/rktnetes.md | 2 +- examples/ignition/k8s-controller.yaml | 10 +++++----- examples/ignition/k8s-worker.yaml | 4 ++-- scripts/get-kubectl | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 270a0d99..719b6730 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Notable changes between releases. ### Examples -* Upgrade Kubernetes v1.5.2 (static) example clusters +* Upgrade Kubernetes v1.5.4 (static) example clusters * Upgrade Kubernetes v1.5.4 (self-hosted) example cluster * Use etcd3 by default in all clusters (remove etcd2 clusters) diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index 746832a0..430a9ee4 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -1,6 +1,6 @@ # Kubernetes -The Kubernetes example provisions a 3 node Kubernetes v1.5.2 cluster with one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs). +The Kubernetes example provisions a 3 node Kubernetes v1.5.4 cluster with one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs). ## Requirements diff --git a/Documentation/rktnetes.md b/Documentation/rktnetes.md index e471424a..edbae639 100644 --- a/Documentation/rktnetes.md +++ b/Documentation/rktnetes.md @@ -1,6 +1,6 @@ # Kubernetes (with rkt) -The `rktnetes` example provisions a 3 node Kubernetes v1.5.2 cluster with [rkt](https://github.com/coreos/rkt) as the container runtime. The cluster has one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs). +The `rktnetes` example provisions a 3 node Kubernetes v1.5.4 cluster with [rkt](https://github.com/coreos/rkt) as the container runtime. The cluster has one controller, two workers, and TLS authentication. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs). ## Requirements diff --git a/examples/ignition/k8s-controller.yaml b/examples/ignition/k8s-controller.yaml index 5de0909a..70204b46 100644 --- a/examples/ignition/k8s-controller.yaml +++ b/examples/ignition/k8s-controller.yaml @@ -64,7 +64,7 @@ systemd: Requires=k8s-assets.target After=k8s-assets.target [Service] - Environment=KUBELET_VERSION=v1.5.2_coreos.0 + Environment=KUBELET_VERSION=v1.5.4_coreos.0 Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid \ --volume dns,kind=host,source=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \ @@ -194,7 +194,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.4_coreos.0 command: - /hyperkube - proxy @@ -228,7 +228,7 @@ storage: hostNetwork: true containers: - name: kube-apiserver - image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.4_coreos.0 command: - /hyperkube - apiserver @@ -289,7 +289,7 @@ storage: spec: containers: - name: kube-controller-manager - image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.4_coreos.0 command: - /hyperkube - controller-manager @@ -335,7 +335,7 @@ storage: hostNetwork: true containers: - name: kube-scheduler - image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.4_coreos.0 command: - /hyperkube - scheduler diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index a84f11d7..f75db386 100644 --- a/examples/ignition/k8s-worker.yaml +++ b/examples/ignition/k8s-worker.yaml @@ -58,7 +58,7 @@ systemd: Requires=k8s-assets.target After=k8s-assets.target [Service] - Environment=KUBELET_VERSION=v1.5.2_coreos.0 + Environment=KUBELET_VERSION=v1.5.4_coreos.0 Environment="RKT_OPTS=--uuid-file-save=/var/run/kubelet-pod.uuid \ --volume dns,kind=host,source=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \ @@ -201,7 +201,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.5.2_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.4_coreos.0 command: - /hyperkube - proxy diff --git a/scripts/get-kubectl b/scripts/get-kubectl index 3cc4059b..3f325714 100755 --- a/scripts/get-kubectl +++ b/scripts/get-kubectl @@ -4,7 +4,7 @@ set -eu DEST=${1:-"bin"} -VERSION="v1.5.2" +VERSION="v1.5.4" URL="https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl"