From 279ede31c7c435c8b31a668798e1b9f08426df7f Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 15 Oct 2016 23:25:36 -0700 Subject: [PATCH] examples: Update self-hosted Kubernetes to v1.4.1 --- CHANGES.md | 2 +- Documentation/bootkube.md | 6 +++--- examples/README.md | 4 ++-- examples/ignition/bootkube-controller.yaml | 4 ++-- examples/ignition/bootkube-worker.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c0be9f54..7160e3f4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,7 +11,7 @@ * Add Kubernetes example with rkt container runtime (i.e. rktnetes) * Upgrade Kubernetes v1.4.0 (static manifest) example clusters * Upgrade Kubernetes v1.4.0 (rktnetes) example clusters -* Upgrade Kubernetes v1.4.0 (self-hosted) example cluster +* Upgrade Kubernetes v1.4.1 (self-hosted) example cluster * Add etcd3 example cluster (PXE in-RAM or install to disk) * Use DNS names (instead of IPs) in example clusters (except bootkube) diff --git a/Documentation/bootkube.md b/Documentation/bootkube.md index 52854c0c..fbf86817 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.0 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.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). ## Requirements @@ -62,7 +62,7 @@ Secure copy the `bootkube` generated assets to any controller node and run `boot scp -r assets core@172.15.0.21:/home/core/assets ssh core@172.15.0.21 'sudo ./bootkube-start' -Watch the temporary control plane logs until the scheduled kubelet takes over in place of the runonce host kubelet. +Watch the temporary control plane logs until the scheduled kubelet takes over in place of the on-host kubelet. [ 299.241291] bootkube[5]: Pod Status: kube-api-checkpoint Running [ 299.241618] bootkube[5]: Pod Status: kube-apiserver Running @@ -88,7 +88,7 @@ You may cleanup the `bootkube` assets on the node, but you should keep the copy kube-system kube-api-checkpoint-node1.example.com 1/1 Running 0 4m kube-system kube-apiserver-iffsz 2/2 Running 0 5m kube-system kube-controller-manager-1148212084-1zx9g 1/1 Running 0 6m - kube-system kube-dns-v19-1003772375-evndl 3/3 Running 0 6m + kube-system kube-dns-v20-3531996453-r18ht 3/3 Running 0 5m kube-system kube-proxy-36jj8 1/1 Running 0 5m kube-system kube-proxy-fdt2t 1/1 Running 0 6m kube-system kube-proxy-sttgn 1/1 Running 0 5m diff --git a/examples/README.md b/examples/README.md index 51909585..b504c8fb 100644 --- a/examples/README.md +++ b/examples/README.md @@ -14,8 +14,8 @@ These examples network boot and provision machines into CoreOS clusters using `b | etcd3-install | Install a 3 node etcd3 cluster to disk | alpha/1153.0.0 | Disk | None | | k8s | Kubernetes cluster with 1 master, 2 workers, and TLS-authentication | alpha/1153.0.0 | Disk | [tutorial](../Documentation/kubernetes.md) | | k8s-install | Kubernetes cluster, installed to disk | alpha/1153.0.0 | Disk | [tutorial](../Documentation/kubernetes.md) | -| rktnetes | Kubernetes cluster with rkt container runtime, 1 master, workers, TLS auth (experimental) | beta/1185.0.0 | Disk | [tutorial](../Documentation/rktnetes.md) | -| rktnetes-install | Kubernetes cluster with rkt container runtime, installed to disk (experimental) | beta/1185.0.0 | Disk | [tutorial](../Documentation/rktnetes.md) | +| rktnetes | Kubernetes cluster with rkt container runtime, 1 master, workers, TLS auth (experimental) | beta/1185.1.0 | Disk | [tutorial](../Documentation/rktnetes.md) | +| rktnetes-install | Kubernetes cluster with rkt container runtime, installed to disk (experimental) | beta/1185.1.0 | Disk | [tutorial](../Documentation/rktnetes.md) | | bootkube | iPXE boot a self-hosted Kubernetes cluster (with bootkube) | beta/1185.1.0 | Disk | [tutorial](../Documentation/bootkube.md) | | bootkube-install | Install a self-hosted Kubernetes cluster (with bootkube) | beta/1185.1.0 | Disk | [tutorial](../Documentation/bootkube.md) | | torus | Torus distributed storage | alpha/1153.0.0 | Disk | [tutorial](../Documentation/torus.md) | diff --git a/examples/ignition/bootkube-controller.yaml b/examples/ignition/bootkube-controller.yaml index 6c51c180..fe67049f 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.0_coreos.0 + Environment=KUBELET_VERSION=v1.4.1_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.0}" + BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.2.1}" 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 2a596895..88980dda 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.0_coreos.0 + Environment=KUBELET_VERSION=v1.4.1_coreos.0 ExecStartPre=/usr/bin/systemctl is-active flanneld.service ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /srv/kubernetes/manifests