From 77c0a4cf2eed0da6eed952d36f2dcd59d2c62ea9 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 12 Apr 2018 20:23:35 -0700 Subject: [PATCH] Update Kubernetes from v1.10.0 to v1.10.1 * Use kubernetes-incubator/bootkube v0.12.0 --- CHANGES.md | 4 +++- README.md | 10 +++++----- aws/container-linux/kubernetes/README.md | 2 +- aws/container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 4 ++-- .../kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- bare-metal/container-linux/kubernetes/README.md | 2 +- bare-metal/container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 4 ++-- .../container-linux/kubernetes/cl/worker.yaml.tmpl | 2 +- digital-ocean/container-linux/kubernetes/README.md | 2 +- .../container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 4 ++-- .../container-linux/kubernetes/cl/worker.yaml.tmpl | 4 ++-- docs/advanced/worker-pools.md | 14 +++++++------- docs/aws.md | 12 ++++++------ docs/bare-metal.md | 12 ++++++------ docs/digital-ocean.md | 12 ++++++------ docs/google-cloud.md | 12 ++++++------ docs/index.md | 10 +++++----- docs/topics/maintenance.md | 2 +- google-cloud/container-linux/kubernetes/README.md | 2 +- .../container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 4 ++-- .../kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- 25 files changed, 68 insertions(+), 66 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 13c6e33d..f47e8179 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,11 +4,13 @@ Notable changes between versions. ## Latest +* Kubernetes [v1.10.1](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#v1101) * Enable etcd v3.3 metrics endpoint ([#175](https://github.com/poseidon/typhoon/pull/175)) * Use `k8s.gcr.io` instead of `gcr.io/google_containers` ([#180](https://github.com/poseidon/typhoon/pull/180)) * Kubernetes [recommends](https://groups.google.com/forum/#!msg/kubernetes-dev/ytjk_rNrTa0/3EFUHvovCAAJ) using the alias to pull from the nearest regional mirror and to abstract the backing container registry * Update kube-dns from v1.14.8 to v1.14.9 * Update etcd from v3.3.2 to v3.3.3 +* Use kubernetes-incubator/bootkube v0.12.0 #### Bare-Metal @@ -102,7 +104,7 @@ Notable changes between versions. * Allow flexvolume plugins to be used on any Typhoon cluster (not just bare-metal) * Upgrade etcd from v3.2.15 to v3.3.2 * Update Calico from v3.0.2 to v3.0.3 -* Use kubernetes-incubator/bootkube v0.10.0 +* Use kubernetes-incubator/bootkube v0.11.0 * [Recommend](https://typhoon.psdn.io/topics/maintenance/#terraform-provider-ct-v021) updating `terraform-provider-ct` plugin from v0.2.0 to [v0.2.1](https://github.com/coreos/terraform-provider-ct/releases/tag/v0.2.1) (action recommended) #### AWS diff --git a/README.md b/README.md index 13746c0d..f8540589 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.10.0 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.10.1 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/) and [preemption](https://typhoon.psdn.io/google-cloud/#preemption) (varies by platform) @@ -44,7 +44,7 @@ Define a Kubernetes cluster by using the Terraform module for your chosen platfo ```tf module "google-cloud-yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.10.1" providers = { google = "google.default" @@ -86,9 +86,9 @@ In 4-8 minutes (varies by platform), the cluster will be ready. This Google Clou $ export KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.10.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.10.1 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.1 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.1 ``` List the pods. diff --git a/aws/container-linux/kubernetes/README.md b/aws/container-linux/kubernetes/README.md index f967e1f4..ae891418 100644 --- a/aws/container-linux/kubernetes/README.md +++ b/aws/container-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.10.0 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.10.1 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/) diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index e16b6333..c007e2d4 100644 --- a/aws/container-linux/kubernetes/bootkube.tf +++ b/aws/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=db36b92abced3c4b0af279adfd5ed4bf0cf8c39f" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index 33abc4e9..f09248f9 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -118,7 +118,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -139,7 +139,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.11.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl b/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index c2d02737..6da4758b 100644 --- a/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -88,7 +88,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -106,7 +106,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.10.0 \ + docker://k8s.gcr.io/hyperkube:v1.10.1 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/bare-metal/container-linux/kubernetes/README.md b/bare-metal/container-linux/kubernetes/README.md index ae254e64..3262a8cb 100644 --- a/bare-metal/container-linux/kubernetes/README.md +++ b/bare-metal/container-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.10.0 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.10.1 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) diff --git a/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 8eb05911..7723ded9 100644 --- a/bare-metal/container-linux/kubernetes/bootkube.tf +++ b/bare-metal/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=db36b92abced3c4b0af279adfd5ed4bf0cf8c39f" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"] diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index ef672843..e9daf6c7 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -119,7 +119,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/hostname filesystem: root mode: 0644 @@ -146,7 +146,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.11.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl index e3935b97..d94a8b28 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -80,7 +80,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/hostname filesystem: root mode: 0644 diff --git a/digital-ocean/container-linux/kubernetes/README.md b/digital-ocean/container-linux/kubernetes/README.md index 2f3d4488..d701039a 100644 --- a/digital-ocean/container-linux/kubernetes/README.md +++ b/digital-ocean/container-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.10.0 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.10.1 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, workloads isolated on workers, [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index 6363ec73..25285858 100644 --- a/digital-ocean/container-linux/kubernetes/bootkube.tf +++ b/digital-ocean/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=db36b92abced3c4b0af279adfd5ed4bf0cf8c39f" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index ef928b73..eae8084c 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -124,7 +124,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -145,7 +145,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.11.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl index c9c9e340..119e13e6 100644 --- a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -94,7 +94,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -112,7 +112,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.10.0 \ + docker://k8s.gcr.io/hyperkube:v1.10.1 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/docs/advanced/worker-pools.md b/docs/advanced/worker-pools.md index 332b573e..5438184c 100644 --- a/docs/advanced/worker-pools.md +++ b/docs/advanced/worker-pools.md @@ -13,7 +13,7 @@ Create a cluster following the AWS [tutorial](../aws.md#cluster). Define a worke ```tf module "tempest-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes/workers?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes/workers?ref=v1.10.1" providers = { aws = "aws.default" @@ -77,7 +77,7 @@ Create a cluster following the Google Cloud [tutorial](../google-cloud.md#cluste ```tf module "yavin-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes/workers?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes/workers?ref=v1.10.1" providers = { google = "google.default" @@ -111,11 +111,11 @@ Verify a managed instance group of workers joins the cluster within a few minute ``` $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.10.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.0 -yavin-16x-worker-jrbf.c.example-com.internal Ready 3m v1.10.0 -yavin-16x-worker-mzdm.c.example-com.internal Ready 3m v1.10.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.10.1 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.1 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.1 +yavin-16x-worker-jrbf.c.example-com.internal Ready 3m v1.10.1 +yavin-16x-worker-mzdm.c.example-com.internal Ready 3m v1.10.1 ``` ### Variables diff --git a/docs/aws.md b/docs/aws.md index 52fe0d3f..11239d10 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -1,6 +1,6 @@ # AWS -In this tutorial, we'll create a Kubernetes v1.10.0 cluster on AWS. +In this tutorial, we'll create a Kubernetes v1.10.1 cluster on AWS. We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, a VPC, gateway, subnets, auto-scaling groups of controllers and workers, network load balancers for controllers and workers, and security groups will be created. @@ -96,7 +96,7 @@ Define a Kubernetes cluster using the module `aws/container-linux/kubernetes`. ```tf module "aws-tempest" { - source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes?ref=v1.10.1" providers = { aws = "aws.default" @@ -149,7 +149,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.11.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.12.0 (update) ``` Plan the resources to be created. @@ -181,9 +181,9 @@ In 4-8 minutes, the Kubernetes cluster will be ready. $ export KUBECONFIG=/home/user/.secrets/clusters/tempest/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -ip-10-0-12-221 Ready 34m v1.10.0 -ip-10-0-19-112 Ready 34m v1.10.0 -ip-10-0-4-22 Ready 34m v1.10.0 +ip-10-0-12-221 Ready 34m v1.10.1 +ip-10-0-19-112 Ready 34m v1.10.1 +ip-10-0-4-22 Ready 34m v1.10.1 ``` List the pods. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index e31cb94e..38125c94 100644 --- a/docs/bare-metal.md +++ b/docs/bare-metal.md @@ -1,6 +1,6 @@ # Bare-Metal -In this tutorial, we'll network boot and provision a Kubernetes v1.10.0 cluster on bare-metal. +In this tutorial, we'll network boot and provision a Kubernetes v1.10.1 cluster on bare-metal. First, we'll deploy a [Matchbox](https://github.com/coreos/matchbox) service and setup a network boot environment. Then, we'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module and power on machines. On PXE boot, machines will install Container Linux to disk, reboot into the disk install, and provision themselves as Kubernetes controllers or workers. @@ -174,7 +174,7 @@ Define a Kubernetes cluster using the module `bare-metal/container-linux/kuberne ```tf module "bare-metal-mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.1" providers = { local = "local.default" @@ -241,7 +241,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.11.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.12.0 (update) ``` Plan the resources to be created. @@ -322,9 +322,9 @@ bootkube[5]: Tearing down temporary bootstrap control plane... $ export KUBECONFIG=/home/user/.secrets/clusters/mercury/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -node1.example.com Ready 11m v1.10.0 -node2.example.com Ready 11m v1.10.0 -node3.example.com Ready 11m v1.10.0 +node1.example.com Ready 11m v1.10.1 +node2.example.com Ready 11m v1.10.1 +node3.example.com Ready 11m v1.10.1 ``` List the pods. diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index c5e9f955..db078893 100644 --- a/docs/digital-ocean.md +++ b/docs/digital-ocean.md @@ -1,6 +1,6 @@ # Digital Ocean -In this tutorial, we'll create a Kubernetes v1.10.0 cluster on Digital Ocean. +In this tutorial, we'll create a Kubernetes v1.10.1 cluster on Digital Ocean. We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, firewall rules, DNS records, tags, and droplets for Kubernetes controllers and workers will be created. @@ -90,7 +90,7 @@ Define a Kubernetes cluster using the module `digital-ocean/container-linux/kube ```tf module "digital-ocean-nemo" { - source = "git::https://github.com/poseidon/typhoon//digital-ocean/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//digital-ocean/container-linux/kubernetes?ref=v1.10.1" providers = { digitalocean = "digitalocean.default" @@ -143,7 +143,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.11.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.12.0 (update) ``` Plan the resources to be created. @@ -176,9 +176,9 @@ In 3-6 minutes, the Kubernetes cluster will be ready. $ export KUBECONFIG=/home/user/.secrets/clusters/nemo/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -10.132.110.130 Ready 10m v1.10.0 -10.132.115.81 Ready 10m v1.10.0 -10.132.124.107 Ready 10m v1.10.0 +10.132.110.130 Ready 10m v1.10.1 +10.132.115.81 Ready 10m v1.10.1 +10.132.124.107 Ready 10m v1.10.1 ``` List the pods. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 8f360cd3..c36c577e 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -1,6 +1,6 @@ # Google Cloud -In this tutorial, we'll create a Kubernetes v1.10.0 cluster on Google Compute Engine (not GKE). +In this tutorial, we'll create a Kubernetes v1.10.1 cluster on Google Compute Engine (not GKE). We'll declare a Kubernetes cluster in Terraform using the Typhoon Terraform module. On apply, a network, firewall rules, managed instance groups of Kubernetes controllers and workers, network load balancers for controllers and workers, and health checks will be created. @@ -97,7 +97,7 @@ Define a Kubernetes cluster using the module `google-cloud/container-linux/kuber ```tf module "google-cloud-yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.10.1" providers = { google = "google.default" @@ -150,7 +150,7 @@ Get or update Terraform modules. $ terraform get # downloads missing modules $ terraform get --update # updates all modules Get: git::https://github.com/poseidon/typhoon (update) -Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.11.0 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.12.0 (update) ``` Plan the resources to be created. @@ -184,9 +184,9 @@ In 4-8 minutes, the Kubernetes cluster will be ready. $ export KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.10.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.10.1 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.1 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.1 ``` List the pods. diff --git a/docs/index.md b/docs/index.md index f542e277..a37a2432 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.10.0 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.10.1 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/) and [preemption](https://typhoon.psdn.io/google-cloud/#preemption) (varies by platform) @@ -44,7 +44,7 @@ Define a Kubernetes cluster by using the Terraform module for your chosen platfo ```tf module "google-cloud-yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.10.1" providers = { google = "google.default" @@ -85,9 +85,9 @@ In 4-8 minutes (varies by platform), the cluster will be ready. This Google Clou $ export KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.10.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.10.1 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.10.1 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.10.1 ``` List the pods. diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 248dce8e..3119d30e 100644 --- a/docs/topics/maintenance.md +++ b/docs/topics/maintenance.md @@ -18,7 +18,7 @@ module "google-cloud-yavin" { } module "bare-metal-mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.0" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.10.1" ... } ``` diff --git a/google-cloud/container-linux/kubernetes/README.md b/google-cloud/container-linux/kubernetes/README.md index 9b7c3386..a9071c5a 100644 --- a/google-cloud/container-linux/kubernetes/README.md +++ b/google-cloud/container-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.10.0 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.10.1 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) * Single or multi-master, workloads isolated on workers, [Calico](https://www.projectcalico.org/) or [flannel](https://github.com/coreos/flannel) networking * On-cluster etcd with TLS, [RBAC](https://kubernetes.io/docs/admin/authorization/rbac/)-enabled, [network policy](https://kubernetes.io/docs/concepts/services-networking/network-policies/) * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index 221c9432..4a75094d 100644 --- a/google-cloud/container-linux/kubernetes/bootkube.tf +++ b/google-cloud/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=db36b92abced3c4b0af279adfd5ed4bf0cf8c39f" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl index 4f9f52c0..a22fa2b4 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -119,7 +119,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -140,7 +140,7 @@ storage: # Move experimental manifests [ -n "$(ls /opt/bootkube/assets/manifests-*/* 2>/dev/null)" ] && mv /opt/bootkube/assets/manifests-*/* /opt/bootkube/assets/manifests && rm -rf /opt/bootkube/assets/manifests-* BOOTKUBE_ACI="$${BOOTKUBE_ACI:-quay.io/coreos/bootkube}" - BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.11.0}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.12.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index e75e2ac7..c0195874 100644 --- a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -89,7 +89,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube - KUBELET_IMAGE_TAG=v1.10.0 + KUBELET_IMAGE_TAG=v1.10.1 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -107,7 +107,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://k8s.gcr.io/hyperkube:v1.10.0 \ + docker://k8s.gcr.io/hyperkube:v1.10.1 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)