examples: Update from Kubernetes v1.8.3 to v1.8.4

This commit is contained in:
Dalton Hubble
2017-11-30 13:12:24 -08:00
parent ae524f57f2
commit 2404d34b0e
9 changed files with 21 additions and 21 deletions

View File

@@ -15,7 +15,7 @@ Notable changes between releases.
### Examples / Modules
* Upgrade Kubernetes example clusters to v1.8.3
* Upgrade Kubernetes example clusters to v1.8.4
* Kubernetes examples clusters enable etcd TLS
* Deploy the Container Linux Update Operator (CLUO) to coordinate reboots of Container Linux nodes in Kubernetes clusters. See the cluster [addon docs](Documentation/cluster-addons.md).
* Kubernetes examples (terraform and non-terraform) mask locksmithd

View File

@@ -1,6 +1,6 @@
# Kubernetes
The Kubernetes example provisions a 3 node Kubernetes v1.8.3 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.
The Kubernetes example provisions a 3 node Kubernetes v1.8.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.
## 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
* `/etc/hosts` entries for `node[1-3].example.com`
Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.8.2 and add it on your $PATH.
Install [bootkube](https://github.com/kubernetes-incubator/bootkube/releases) v0.9.0 and add it on your $PATH.
```sh
$ bootkube version
Version: v0.8.2
Version: v0.9.0
```
## Examples
@@ -108,9 +108,9 @@ $ ssh core@node1.example.com 'journalctl -f -u bootkube'
$ export KUBECONFIG=assets/auth/kubeconfig
$ kubectl get nodes
NAME STATUS AGE VERSION
node1.example.com Ready 11m v1.8.3
node2.example.com Ready 11m v1.8.3
node3.example.com Ready 11m v1.8.3
node1.example.com Ready 11m v1.8.4
node2.example.com Ready 11m v1.8.4
node3.example.com Ready 11m v1.8.4
$ kubectl get pods --all-namespaces
NAMESPACE NAME READY STATUS RESTARTS AGE

View File

@@ -30,10 +30,10 @@
* [matchbox with rkt](Documentation/getting-started-rkt.md)
* Clusters
* [etcd3](Documentation/getting-started-rkt.md) - Install a 3-node etcd3 cluster
* [Kubernetes](Documentation/bootkube.md) - Install a 3-node Kubernetes v1.8.3 cluster
* [Kubernetes](Documentation/bootkube.md) - Install a 3-node Kubernetes v1.8.4 cluster
* Clusters (Terraform-based)
* [etcd3](examples/terraform/etcd3-install/README.md) - Install a 3-node etcd3 cluster
* [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.8.3 cluster
* [Kubernetes](examples/terraform/bootkube-install/README.md) - Install a 3-node Kubernetes v1.8.4 cluster
### Projects

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 |
| [etcd3-install](terraform/etcd3-install) | Install a 3-node etcd3 cluster |
| [bootkube-install](terraform/bootkube-install) | Install a 3-node Kubernetes v1.8.3 cluster |
| [bootkube-install](terraform/bootkube-install) | Install a 3-node Kubernetes v1.8.4 cluster |
### 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/1520.8.0 | RAM | NA |
| etcd3 | PXE boot a 3-node etcd3 cluster with proxies | stable/1520.8.0 | RAM | None |
| etcd3-install | Install a 3-node etcd3 cluster to disk | stable/1520.8.0 | Disk | None |
| bootkube | PXE boot a 3-node Kubernetes v1.8.3 cluster | stable/1520.8.0 | Disk | [tutorial](../Documentation/bootkube.md) |
| bootkube-install | Install a 3-node Kubernetes v1.8.3 cluster | stable/1520.8.0 | Disk | [tutorial](../Documentation/bootkube.md) |
| bootkube | PXE boot a 3-node Kubernetes v1.8.4 cluster | stable/1520.8.0 | Disk | [tutorial](../Documentation/bootkube.md) |
| bootkube-install | Install a 3-node Kubernetes v1.8.4 cluster | stable/1520.8.0 | Disk | [tutorial](../Documentation/bootkube.md) |
### Customization

View File

@@ -127,7 +127,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
KUBELET_IMAGE_TAG=v1.8.3
KUBELET_IMAGE_TAG=v1.8.4
- path: /etc/ssl/etcd/.empty
filesystem: root
mode: 0644
@@ -158,7 +158,7 @@ storage:
# Wrapper for bootkube start
set -e
BOOTKUBE_ACI="${BOOTKUBE_ACI:-quay.io/coreos/bootkube}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.8.2}"
BOOTKUBE_VERSION="${BOOTKUBE_VERSION:-v0.9.0}"
BOOTKUBE_ASSETS="${BOOTKUBE_ASSETS:-/opt/bootkube/assets}"
exec /usr/bin/rkt run \
--trust-keys-from-https \

View File

@@ -96,7 +96,7 @@ storage:
contents:
inline: |
KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube
KUBELET_IMAGE_TAG=v1.8.3
KUBELET_IMAGE_TAG=v1.8.4
- path: /etc/ssl/etcd/.empty
filesystem: root
mode: 0644

View File

@@ -1,6 +1,6 @@
# Kubernetes
The Kubernetes example shows how to use Matchbox to network boot and provision a 3 node Kubernetes v1.8.3 cluster. This example uses [Terraform](https://www.terraform.io/intro/index.html) and a module provided by [Typhoon](https://github.com/poseidon/typhoon) to describe cluster resources. [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube) is run once to bootstrap the Kubernetes control plane.
The Kubernetes example shows how to use Matchbox to network boot and provision a 3 node Kubernetes v1.8.4 cluster. This example uses [Terraform](https://www.terraform.io/intro/index.html) and a module provided by [Typhoon](https://github.com/poseidon/typhoon) to describe cluster resources. [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube) is run once to bootstrap the Kubernetes control plane.
## Requirements
@@ -129,9 +129,9 @@ $ sudo ./scripts/libvirt [start|reboot|shutdown|poweroff|destroy]
$ export KUBECONFIG=assets/auth/kubeconfig
$ kubectl get nodes
NAME STATUS AGE VERSION
node1.example.com Ready 11m v1.8.3
node2.example.com Ready 11m v1.8.3
node3.example.com Ready 11m v1.8.3
node1.example.com Ready 11m v1.8.4
node2.example.com Ready 11m v1.8.4
node3.example.com Ready 11m v1.8.4
$ kubectl get pods --all-namespaces
NAMESPACE NAME READY STATUS RESTARTS AGE

View File

@@ -1,6 +1,6 @@
// Kubernetes cluster
module "cluster" {
source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=07d257aa7bcfba1ced569308ae64183def9efe81"
source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.8.4"
# install
matchbox_http_endpoint = "${var.matchbox_http_endpoint}"

View File

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