diff --git a/CHANGES.md b/CHANGES.md index fcc6de49..29218a79 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,10 @@ * Deprecate Pixiecore support * Update Fuze and Ignition to v0.11.2 +#### Examples + +* Upgrade Kubernetes v1.4.7 (self-hosted) example cluster + ## v0.4.2 (2016-12-7) #### Improvements diff --git a/Documentation/bootkube.md b/Documentation/bootkube.md index cc2d976b..5b53c9a8 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.6 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.7 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 @@ -15,7 +15,7 @@ Ensure that you've gone through the [bootcfg with rkt](getting-started-rkt.md) o Build and install the [fork of bootkube](https://github.com/dghubble/bootkube), which supports DNS names. $ bootkube version - Version: bd5a87af28f84898272519894b09d16c5e5df441 + Version: 4a4ae6e78a59258b528f7de57db8d5cf5786a8a5 ## Examples @@ -88,17 +88,17 @@ You may cleanup the `bootkube` assets on the node, but you should keep the copy $ kubectl get pods --all-namespaces NAMESPACE NAME READY STATUS RESTARTS AGE - 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-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 - kube-system kube-scheduler-1921762579-z6jn6 1/1 Running 0 6m - kube-system kubelet-1ibsf 1/1 Running 0 6m - kube-system kubelet-65h6j 1/1 Running 0 5m - kube-system kubelet-d1qql 1/1 Running 0 5m + kube-system checkpoint-installer-cpjrm 1/1 Running 0 2m + kube-system kube-apiserver-rvjes 1/1 Running 0 2m + kube-system kube-controller-manager-3900529476-5n9xb 1/1 Running 0 4m + kube-system kube-controller-manager-3900529476-rq6p8 1/1 Running 0 4m + kube-system kube-dns-4101612645-oeu5g 4/4 Running 0 4m + kube-system kube-proxy-f5kb8 1/1 Running 0 2m + kube-system kube-proxy-jkg4z 1/1 Running 0 2m + kube-system kube-proxy-rrmuv 1/1 Running 0 2m + kube-system kube-scheduler-1084603659-qaqbk 1/1 Running 0 3m + kube-system kube-scheduler-1084603659-rztvw 1/1 Running 0 4m + kube-system pod-checkpointer-node1.example.com 1/1 Running 0 1m Try deleting pods to see that the cluster is resilient to failures and machine restarts (CoreOS auto-updates). diff --git a/examples/ignition/bootkube-controller.yaml b/examples/ignition/bootkube-controller.yaml index 0470a669..0c3c48da 100644 --- a/examples/ignition/bootkube-controller.yaml +++ b/examples/ignition/bootkube-controller.yaml @@ -70,7 +70,6 @@ systemd: --allow-privileged \ --hostname-override={{.domain_name}} \ --node-labels=master=true \ - --minimum-container-ttl-duration=6m0s \ --cluster_dns={{.k8s_dns_service_ip}} \ --cluster_domain=cluster.local ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid @@ -103,7 +102,7 @@ storage: contents: inline: | KUBELET_ACI=quay.io/coreos/hyperkube - KUBELET_VERSION=v1.4.6_coreos.0 + KUBELET_VERSION=v1.4.7_coreos.0 - path: /etc/hostname filesystem: root mode: 0644 @@ -128,7 +127,7 @@ storage: # Wrapper for bootkube start set -e BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.2.5}" + BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.2.6}" 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 f0fbfe5a..88a10582 100644 --- a/examples/ignition/bootkube-worker.yaml +++ b/examples/ignition/bootkube-worker.yaml @@ -60,7 +60,6 @@ systemd: --pod-manifest-path=/etc/kubernetes/manifests \ --allow-privileged \ --hostname-override={{.domain_name}} \ - --minimum-container-ttl-duration=6m0s \ --cluster_dns={{.k8s_dns_service_ip}} \ --cluster_domain=cluster.local ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid @@ -93,7 +92,7 @@ storage: contents: inline: | KUBELET_ACI=quay.io/coreos/hyperkube - KUBELET_VERSION=v1.4.6_coreos.0 + KUBELET_VERSION=v1.4.7_coreos.0 - path: /etc/hostname filesystem: root mode: 0644