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

Merge pull request #585 from coreos/kubernetes-upgrade

Browse Source 
examples: Upgrade Kubernetes to v1.6.6
This commit is contained in:
Dalton Hubble
2017-06-24 15:02:20 -07:00
committed by GitHub
parent 9bc6edc65b ff06990edb
commit 6f02107448
12 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@@ -10,6 +10,7 @@ Notable changes between releases.
### Examples / Modules ### Examples / Modules
* Upgrade Kubernetes v1.6.6 example clusters
* Kubernetes examples clusters enable etcd TLS (unless experimental self-hosted etcd is enabled) * Kubernetes examples clusters enable etcd TLS (unless experimental self-hosted etcd is enabled)
## v0.6.1 (2017-05-25) ## v0.6.1 (2017-05-25)

44
Documentation/bootkube.md
View File

@@ -1,6 +1,6 @@
# Self-hosted Kubernetes # Self-hosted Kubernetes
The self-hosted Kubernetes example provisions a 3 node "self-hosted" Kubernetes v1.6.4 cluster. [bootkube](https://github.com/kubernetes-incubator/bootkube) is run once on a controller node to bootstrap Kubernetes control plane components as pods before exiting. An etcd3 cluster across controllers is used to back Kubernetes and coordinate Container Linux auto-updates (enabled for disk installs). The self-hosted Kubernetes example provisions a 3 node "self-hosted" Kubernetes v1.6.6 cluster. [bootkube](https://github.com/kubernetes-incubator/bootkube) is run once on a controller node to bootstrap Kubernetes control plane components as pods before exiting. An etcd3 cluster across controllers is used to back Kubernetes and coordinate Container Linux auto-updates (enabled for disk installs).
## Requirements ## Requirements
@@ -11,11 +11,11 @@ Ensure that you've gone through the [matchbox with rkt](getting-started-rkt.md)
* Create the example libvirt client VMs * Create the example libvirt client VMs
* `/etc/hosts` entries for `node[1-3].example.com` (or pass custom names to `k8s-certgen`) * `/etc/hosts` entries for `node[1-3].example.com` (or pass custom names to `k8s-certgen`)
Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.4.4 and add it somewhere on your PATH. Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.4.5 and add it on your $PATH.
```sh ```sh
$ bootkube version $ bootkube version
Version: v0.4.4 Version: v0.4.5
``` ```
## Examples ## Examples
@@ -78,7 +78,7 @@ for node in 'node1' 'node2' 'node3'; do
done done
``` ```
Secure copy the `bootkube` generated assets to any controller node and run `bootkube-start`. Secure copy the `bootkube` generated assets to any controller node and run `bootkube-start` (takes ~10 minutes).
```sh ```sh
scp -r assets core@node1.example.com:/home/core scp -r assets core@node1.example.com:/home/core
@@ -105,27 +105,27 @@ You may cleanup the `bootkube` assets on the node, but you should keep the copy
```sh ```sh
$ KUBECONFIG=assets/auth/kubeconfig $ KUBECONFIG=assets/auth/kubeconfig
$ kubectl get nodes $ kubectl get nodes
NAME STATUS AGE NAME STATUS AGE VERSION
node1.example.com Ready 3m node1.example.com Ready 7m v1.6.6+coreos.1
node2.example.com Ready 3m node2.example.com Ready 7m v1.6.6+coreos.1
node3.example.com Ready 3m node3.example.com Ready 7m v1.6.6+coreos.1
$ kubectl get pods --all-namespaces $ kubectl get pods --all-namespaces
NAMESPACE NAME READY STATUS RESTARTS AGE NAMESPACE NAME READY STATUS RESTARTS AGE
kube-system checkpoint-installer-p8g8r 1/1 Running 1 13m kube-system kube-apiserver-zd1k3 1/1 Running 0 7m
kube-system kube-apiserver-s5gnx 1/1 Running 1 41s kube-system kube-controller-manager-762207937-2ztxb 1/1 Running 0 7m
kube-system kube-controller-manager-3438979800-jrlnd 1/1 Running 1 13m kube-system kube-controller-manager-762207937-vf6bk 1/1 Running 1 7m
kube-system kube-controller-manager-3438979800-tkjx7 1/1 Running 1 13m kube-system kube-dns-2431531914-qc752 3/3 Running 0 7m
kube-system kube-dns-4101612645-xt55f 4/4 Running 4 13m kube-system kube-flannel-180mz 2/2 Running 1 7m
kube-system kube-flannel-pl5c2 2/2 Running 0 13m kube-system kube-flannel-jjr0x 2/2 Running 0 7m
kube-system kube-flannel-r9t5r 2/2 Running 3 13m kube-system kube-flannel-mlr9w 2/2 Running 0 7m
kube-system kube-flannel-vfb0s 2/2 Running 4 13m kube-system kube-proxy-0jlq7 1/1 Running 0 7m
kube-system kube-proxy-cvhmj 1/1 Running 0 13m kube-system kube-proxy-k4mjl 1/1 Running 0 7m
kube-system kube-proxy-hf9mh 1/1 Running 1 13m kube-system kube-proxy-l4xrd 1/1 Running 0 7m
kube-system kube-proxy-kpl73 1/1 Running 1 13m kube-system kube-scheduler-1873228005-5d2mk 1/1 Running 0 7m
kube-system kube-scheduler-694795526-1l23b 1/1 Running 1 13m kube-system kube-scheduler-1873228005-s4w27 1/1 Running 0 7m
kube-system kube-scheduler-694795526-fks0b 1/1 Running 1 13m kube-system pod-checkpointer-hb960 1/1 Running 0 7m
kube-system pod-checkpointer-node1.example.com 1/1 Running 2 10m kube-system pod-checkpointer-hb960-node1.example.com 1/1 Running 0 6m
``` ```
Try deleting pods to see that the cluster is resilient to failures and machine restarts (Container Linux auto-updates). Try deleting pods to see that the cluster is resilient to failures and machine restarts (Container Linux auto-updates).

4
README.md
View File

@@ -41,13 +41,13 @@ Create [example](examples) clusters on-premise or locally with [QEMU/KVM](script
* [simple-install](Documentation/getting-started.md) - Install Container Linux with an SSH key on all machines (beginner) * [simple-install](Documentation/getting-started.md) - Install Container Linux with an SSH key on all machines (beginner)
* [etcd3](examples/terraform/etcd3-install/README.md) - Install a 3-node etcd3 cluster * [etcd3](examples/terraform/etcd3-install/README.md) - Install a 3-node etcd3 cluster
* [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node self-hosted Kubernetes v1.6.4 cluster * [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node self-hosted Kubernetes v1.6.6 cluster
* Terraform [Modules](examples/terraform/modules) - Re-usable Terraform Modules * Terraform [Modules](examples/terraform/modules) - Re-usable Terraform Modules
**Manual** **Manual**
* [etcd3](Documentation/getting-started-rkt.md) - Install a 3-node etcd3 cluster * [etcd3](Documentation/getting-started-rkt.md) - Install a 3-node etcd3 cluster
* [Kubernetes](Documentation/bootkube.md) - Install a 3-node self-hosted Kubernetes v1.6.4 cluster * [Kubernetes](Documentation/bootkube.md) - Install a 3-node self-hosted Kubernetes v1.6.6 cluster
## Contrib ## Contrib

6
examples/README.md
View File

@@ -10,7 +10,7 @@ These examples use [Terraform](https://www.terraform.io/intro/) as a client to M
|-------------------------------|-------------------------------| |-------------------------------|-------------------------------|
| [simple-install](terraform/simple-install) | Install Container Linux with an SSH key | | [simple-install](terraform/simple-install) | Install Container Linux with an SSH key |
| [etcd3-install](terraform/etcd3-install) | Install a 3-node etcd3 cluster | | [etcd3-install](terraform/etcd3-install) | Install a 3-node etcd3 cluster |
| [bootkube-install](terraform/bootkube-install) | Install a 3-node self-hosted Kubernetes v1.6.4 cluster | | [bootkube-install](terraform/bootkube-install) | Install a 3-node self-hosted Kubernetes v1.6.6 cluster |
### Customization ### Customization
@@ -27,8 +27,8 @@ These examples mount raw Matchbox objects into a Matchbox server's `/var/lib/mat
| grub | CoreOS Container Linux via GRUB2 Netboot | stable/1353.7.0 | RAM | NA | | grub | CoreOS Container Linux via GRUB2 Netboot | stable/1353.7.0 | RAM | NA |
| etcd3 | PXE boot a 3 node etcd3 cluster with proxies | stable/1353.7.0 | RAM | None | | etcd3 | PXE boot a 3 node etcd3 cluster with proxies | stable/1353.7.0 | RAM | None |
| etcd3-install | Install a 3 node etcd3 cluster to disk | stable/1353.7.0 | Disk | None | | etcd3-install | Install a 3 node etcd3 cluster to disk | stable/1353.7.0 | Disk | None |
| bootkube | PXE boot a self-hosted Kubernetes v1.6.4 cluster | stable/1353.7.0 | Disk | [tutorial](../Documentation/bootkube.md) | | bootkube | PXE boot a self-hosted Kubernetes v1.6.6 cluster | stable/1353.7.0 | Disk | [tutorial](../Documentation/bootkube.md) |
| bootkube-install | Install a self-hosted Kubernetes v1.6.4 cluster | stable/1353.7.0 | Disk | [tutorial](../Documentation/bootkube.md) | | bootkube-install | Install a self-hosted Kubernetes v1.6.6 cluster | stable/1353.7.0 | Disk | [tutorial](../Documentation/bootkube.md) |
### Customization ### Customization

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

@@ -129,7 +129,7 @@ storage:
contents: contents:
inline: | inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
KUBELET_IMAGE_TAG=v1.6.4_coreos.0 KUBELET_IMAGE_TAG=v1.6.6_coreos.1
- path: /etc/ssl/etcd/.empty - path: /etc/ssl/etcd/.empty
filesystem: root filesystem: root
mode: 0644 mode: 0644
@@ -160,7 +160,7 @@ storage:
# Wrapper for bootkube start # Wrapper for bootkube start
set -e set -e
BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.4}" BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.5}"
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \ exec /usr/bin/rkt run \
--trust-keys-from-https \ --trust-keys-from-https \

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

@@ -100,7 +100,7 @@ storage:
contents: contents:
inline: | inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
KUBELET_IMAGE_TAG=v1.6.4_coreos.0 KUBELET_IMAGE_TAG=v1.6.6_coreos.1
- path: /etc/ssl/etcd/.empty - path: /etc/ssl/etcd/.empty
filesystem: root filesystem: root
mode: 0644 mode: 0644

2
examples/terraform/bootkube-install/README.md
View File

@@ -1,6 +1,6 @@
# Self-hosted Kubernetes # Self-hosted Kubernetes
The self-hosted Kubernetes example shows how to use matchbox to network boot and provision a 3 node "self-hosted" Kubernetes v1.6.4 cluster. [bootkube](https://github.com/kubernetes-incubator/bootkube) is run once on a controller node to bootstrap Kubernetes control plane components as pods before exiting. The self-hosted Kubernetes example shows how to use matchbox to network boot and provision a 3 node "self-hosted" Kubernetes v1.6.6 cluster. [bootkube](https://github.com/kubernetes-incubator/bootkube) is run once on a controller node to bootstrap Kubernetes control plane components as pods before exiting.
## Requirements ## Requirements

2
examples/terraform/modules/bootkube/bootkube.tf
View File

@@ -1,6 +1,6 @@
# Self-hosted Kubernetes assets (kubeconfig, manifests) # Self-hosted Kubernetes assets (kubeconfig, manifests)
module "bootkube" { module "bootkube" {
source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=21131aa65e371389fda72a93b86b59a84aa01c1b" source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=v0.4.5"
cluster_name = "${var.cluster_name}" cluster_name = "${var.cluster_name}"
api_servers = ["${var.k8s_domain_name}"] api_servers = ["${var.k8s_domain_name}"]

4
examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl
View File

@@ -138,7 +138,7 @@ storage:
contents: contents:
inline: | inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
KUBELET_IMAGE_TAG=v1.6.4_coreos.0 KUBELET_IMAGE_TAG=v1.6.6_coreos.1
- path: /etc/hostname - path: /etc/hostname
filesystem: root filesystem: root
mode: 0644 mode: 0644
@@ -166,7 +166,7 @@ storage:
[ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests [ -d /opt/bootkube/assets/experimental/manifests ] && mv /opt/bootkube/assets/experimental/manifests/* /opt/bootkube/assets/manifests && rm -r /opt/bootkube/assets/experimental/manifests
[ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests [ -d /opt/bootkube/assets/experimental/bootstrap-manifests ] && mv /opt/bootkube/assets/experimental/bootstrap-manifests/* /opt/bootkube/assets/bootstrap-manifests && rm -r /opt/bootkube/assets/experimental/bootstrap-manifests
BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.4}" BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.4.5}"
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \ exec /usr/bin/rkt run \
--trust-keys-from-https \ --trust-keys-from-https \

2
examples/terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl
View File

@@ -104,7 +104,7 @@ storage:
contents: contents:
inline: | inline: |
KUBELET_IMAGE_URL=quay.io/coreos/hyperkube KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
KUBELET_IMAGE_TAG=v1.6.4_coreos.0 KUBELET_IMAGE_TAG=v1.6.6_coreos.1
- path: /etc/hostname - path: /etc/hostname
filesystem: root filesystem: root
mode: 0644 mode: 0644

2
scripts/dev/get-bootkube
View File

@@ -4,7 +4,7 @@
set -eu set -eu
DEST=${1:-"bin"} DEST=${1:-"bin"}
VERSION="v0.4.4" VERSION="v0.4.5"
URL="https://github.com/kubernetes-incubator/bootkube/releases/download/${VERSION}/bootkube.tar.gz" URL="https://github.com/kubernetes-incubator/bootkube/releases/download/${VERSION}/bootkube.tar.gz"

2
scripts/dev/get-kubectl
View File

@@ -4,7 +4,7 @@
set -eu set -eu
DEST=${1:-"bin"} DEST=${1:-"bin"}
VERSION="v1.6.4" VERSION="v1.6.6"
URL="https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl" URL="https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/amd64/kubectl"