github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-27 10:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Kubernetes clusters to v1.4.3

Browse Source 
* Upgrade rktnetes Kubernetes clusters
* Upgrade dockernetes Kubernetes clusters
* Upgrade self-hosted Kubernetes clusters
This commit is contained in:
Dalton Hubble
2016-10-19 12:11:19 -07:00
parent cee750cf3e
commit eb0e109f09
10 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.md
View File

@@ -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)

2
Documentation/bootkube.md
View File

@@ -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

2
Documentation/kubernetes.md
View File

@@ -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

2
Documentation/rktnetes.md
View File

@@ -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

4
examples/ignition/bootkube-controller.yaml
View File

@@ -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 \

2
examples/ignition/bootkube-worker.yaml
View File

@@ -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

10
examples/ignition/k8s-controller.yaml
View File

@@ -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

4
examples/ignition/k8s-worker.yaml
View File

@@ -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

10
examples/ignition/rktnetes-controller.yaml
View File

@@ -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

4
examples/ignition/rktnetes-worker.yaml
View File

@@ -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