From 5ee63aebe58272b278bc7b9f03f60bd51332f83e Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 5 Jan 2017 10:54:06 -0800 Subject: [PATCH] examples: Update Kubernetes (static) to v1.5.1 --- CHANGES.md | 2 +- Documentation/kubernetes.md | 2 +- examples/ignition/k8s-controller.yaml | 10 +++++----- examples/ignition/k8s-worker.yaml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2dba343e..a5ce1162 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ #### Examples -* Upgrade Kubernetes v1.4.7 (static) example clusters +* Upgrade Kubernetes v1.5.1 (static) example clusters * Upgrade Kubernetes v1.5.1 (self-hosted) example cluster * Combine rktnetes Ignition into Kubernetes static cluster diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index 90640142..e0d9109f 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -1,7 +1,7 @@ # Kubernetes -The Kubernetes example provisions a 3 node Kubernetes v1.4.7 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.1 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/examples/ignition/k8s-controller.yaml b/examples/ignition/k8s-controller.yaml index 9c271a90..ff47e14e 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.4.7_coreos.0 + Environment=KUBELET_VERSION=v1.5.1_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.4.7_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 command: - /hyperkube - proxy @@ -228,7 +228,7 @@ storage: hostNetwork: true containers: - name: kube-apiserver - image: quay.io/coreos/hyperkube:v1.4.7_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 command: - /hyperkube - apiserver @@ -288,7 +288,7 @@ storage: spec: containers: - name: kube-controller-manager - image: quay.io/coreos/hyperkube:v1.4.7_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 command: - /hyperkube - controller-manager @@ -334,7 +334,7 @@ storage: hostNetwork: true containers: - name: kube-scheduler - image: quay.io/coreos/hyperkube:v1.4.7_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 command: - /hyperkube - scheduler diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index 29997ede..d0bf6d72 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.4.7_coreos.0 + Environment=KUBELET_VERSION=v1.5.1_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.4.7_coreos.0 + image: quay.io/coreos/hyperkube:v1.5.1_coreos.0 command: - /hyperkube - proxy