From eb0e109f091887f1e9958cc2b1fd9ca5c3ac9060 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 19 Oct 2016 12:11:19 -0700 Subject: [PATCH] Upgrade Kubernetes clusters to v1.4.3 * Upgrade rktnetes Kubernetes clusters * Upgrade dockernetes Kubernetes clusters * Upgrade self-hosted Kubernetes clusters --- CHANGES.md | 6 ++++++ Documentation/bootkube.md | 2 +- Documentation/kubernetes.md | 2 +- Documentation/rktnetes.md | 2 +- examples/ignition/bootkube-controller.yaml | 4 ++-- examples/ignition/bootkube-worker.yaml | 2 +- examples/ignition/k8s-controller.yaml | 10 +++++----- examples/ignition/k8s-worker.yaml | 4 ++-- examples/ignition/rktnetes-controller.yaml | 10 +++++----- examples/ignition/rktnetes-worker.yaml | 4 ++-- 10 files changed, 26 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 80e11f46..6c7d43d4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # coreos-baremetal bootcfg +#### Examples + +* Upgrade Kubernetes v1.4.3 (static manifest) example clusters +* Upgrade Kubernetes v1.4.3 (rktnetes) example clusters +* Upgrade Kubernetes v1.4.3 (self-hosted) example cluster + ## Latest * Add ARM and AMR64 release architectures (#309) diff --git a/Documentation/bootkube.md b/Documentation/bootkube.md index ee721e42..e5f4205f 100644 --- a/Documentation/bootkube.md +++ b/Documentation/bootkube.md @@ -1,7 +1,7 @@ # Self-Hosted Kubernetes -The self-hosted Kubernetes example provisions a 3 node "self-hosted" Kubernetes v1.4.1 cluster. On-host kubelets wait for an apiserver to become reachable, then yield to kubelet pods scheduled via daemonset. [bootkube](https://github.com/kubernetes-incubator/bootkube) is run on any controller to bootstrap a temporary apiserver which schedules control plane components as pods before exiting. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs). +The self-hosted Kubernetes example provisions a 3 node "self-hosted" Kubernetes v1.4.3 cluster. On-host kubelets wait for an apiserver to become reachable, then yield to kubelet pods scheduled via daemonset. [bootkube](https://github.com/kubernetes-incubator/bootkube) is run on any controller to bootstrap a temporary apiserver which schedules control plane components as pods before exiting. An etcd cluster backs Kubernetes and coordinates CoreOS auto-updates (enabled for disk installs). ## Requirements diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index 65ca279f..37ce5b04 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -1,7 +1,7 @@ # Kubernetes -The Kubernetes example provisions a 3 node Kubernetes v1.4.1 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.4.3 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 7fc89f0b..f1bab301 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.4.1 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.4.3 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/bootkube-controller.yaml b/examples/ignition/bootkube-controller.yaml index fe67049f..ba589601 100644 --- a/examples/ignition/bootkube-controller.yaml +++ b/examples/ignition/bootkube-controller.yaml @@ -46,7 +46,7 @@ systemd: [Service] Environment="RKT_OPTS=--volume=resolv,kind=host,source=/etc/resolv.conf --mount volume=resolv,target=/etc/resolv.conf --volume var-log,kind=host,source=/var/log --mount volume=var-log,target=/var/log" Environment=KUBELET_ACI=quay.io/coreos/hyperkube - Environment=KUBELET_VERSION=v1.4.1_coreos.0 + Environment=KUBELET_VERSION=v1.4.3_coreos.0 ExecStartPre=/usr/bin/systemctl is-active flanneld.service ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests @@ -111,7 +111,7 @@ storage: # Wrapper for bootkube start set -e BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.2.1}" + BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.2.2}" BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/home/core/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/examples/ignition/bootkube-worker.yaml b/examples/ignition/bootkube-worker.yaml index 88980dda..04aeda6c 100644 --- a/examples/ignition/bootkube-worker.yaml +++ b/examples/ignition/bootkube-worker.yaml @@ -37,7 +37,7 @@ systemd: [Service] Environment="RKT_OPTS=--volume=resolv,kind=host,source=/etc/resolv.conf --mount volume=resolv,target=/etc/resolv.conf --volume var-log,kind=host,source=/var/log --mount volume=var-log,target=/var/log" Environment=KUBELET_ACI=quay.io/coreos/hyperkube - Environment=KUBELET_VERSION=v1.4.1_coreos.0 + Environment=KUBELET_VERSION=v1.4.3_coreos.0 ExecStartPre=/usr/bin/systemctl is-active flanneld.service ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests diff --git a/examples/ignition/k8s-controller.yaml b/examples/ignition/k8s-controller.yaml index 56f2a9f9..5fe5a36c 100644 --- a/examples/ignition/k8s-controller.yaml +++ b/examples/ignition/k8s-controller.yaml @@ -58,7 +58,7 @@ systemd: Requires=k8s-assets.target After=k8s-assets.target [Service] - Environment=KUBELET_VERSION=v1.4.1_coreos.0 + Environment=KUBELET_VERSION=v1.4.3_coreos.0 Environment="RKT_OPTS=--volume dns,kind=host,source=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \ --volume var-log,kind=host,source=/var/log \ @@ -139,7 +139,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - proxy @@ -167,7 +167,7 @@ storage: hostNetwork: true containers: - name: kube-apiserver - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - apiserver @@ -227,7 +227,7 @@ storage: spec: containers: - name: kube-controller-manager - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - controller-manager @@ -273,7 +273,7 @@ storage: hostNetwork: true containers: - name: kube-scheduler - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - scheduler diff --git a/examples/ignition/k8s-worker.yaml b/examples/ignition/k8s-worker.yaml index 8bad1b3b..03df1be4 100644 --- a/examples/ignition/k8s-worker.yaml +++ b/examples/ignition/k8s-worker.yaml @@ -52,7 +52,7 @@ systemd: Requires=k8s-assets.target After=k8s-assets.target [Service] - Environment=KUBELET_VERSION=v1.4.1_coreos.0 + Environment=KUBELET_VERSION=v1.4.3_coreos.0 Environment="RKT_OPTS=--volume dns,kind=host,source=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \ --volume var-log,kind=host,source=/var/log \ @@ -146,7 +146,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - proxy diff --git a/examples/ignition/rktnetes-controller.yaml b/examples/ignition/rktnetes-controller.yaml index f67d9226..b9cc72c0 100644 --- a/examples/ignition/rktnetes-controller.yaml +++ b/examples/ignition/rktnetes-controller.yaml @@ -58,7 +58,7 @@ systemd: Requires=k8s-assets.target After=k8s-assets.target [Service] - Environment=KUBELET_VERSION=v1.4.1_coreos.0 + Environment=KUBELET_VERSION=v1.4.3_coreos.0 Environment="RKT_OPTS=--volume dns,kind=host,source=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \ --volume rkt,kind=host,source=/opt/bin/host-rkt \ @@ -176,7 +176,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - proxy @@ -210,7 +210,7 @@ storage: hostNetwork: true containers: - name: kube-apiserver - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - apiserver @@ -270,7 +270,7 @@ storage: spec: containers: - name: kube-controller-manager - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - controller-manager @@ -316,7 +316,7 @@ storage: hostNetwork: true containers: - name: kube-scheduler - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - scheduler diff --git a/examples/ignition/rktnetes-worker.yaml b/examples/ignition/rktnetes-worker.yaml index f4051110..32c00fd1 100644 --- a/examples/ignition/rktnetes-worker.yaml +++ b/examples/ignition/rktnetes-worker.yaml @@ -52,7 +52,7 @@ systemd: Requires=k8s-assets.target After=k8s-assets.target [Service] - Environment=KUBELET_VERSION=v1.4.1_coreos.0 + Environment=KUBELET_VERSION=v1.4.3_coreos.0 Environment="RKT_OPTS=--volume dns,kind=host,source=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \ --volume rkt,kind=host,source=/opt/bin/host-rkt \ @@ -182,7 +182,7 @@ storage: hostNetwork: true containers: - name: kube-proxy - image: quay.io/coreos/hyperkube:v1.4.1_coreos.0 + image: quay.io/coreos/hyperkube:v1.4.3_coreos.0 command: - /hyperkube - proxy