diff --git a/CHANGES.md b/CHANGES.md index a62a1179..1b96e567 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,10 +2,19 @@ Notable changes between versions. +## v1.7.7 + +* Kubernetes v1.7.7 +* Use kubernetes-incubator/bootkube v0.7.0 +* Update kube-dns to 1.14.5 to fix dnsmasq [vulnerability](https://security.googleblog.com/2017/10/behind-masq-yet-more-dns-and-dhcp.html) +* Calico v2.6.1 +* flannel-cni v0.3.0 + * Update flannel CNI config to fix hostPort + ## v1.7.5 * Kubernetes v1.7.5 -* Use kubernete-incubator/bootkube v0.6.2 +* Use kubernetes-incubator/bootkube v0.6.2 * Add AWS Terraform module (alpha) * Add support for Calico networking (bare-metal, Google Cloud, AWS) * Change networking default from "flannel" to "calico" diff --git a/README.md b/README.md index 70fb3677..2c2166e2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.7.7 (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, Dashboards, Metrics, and other optional [addons](https://typhoon.psdn.io/addons/overview/) @@ -78,9 +78,9 @@ In 5-10 minutes (varies by platform), the cluster will be ready. This Google Clo $ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-1682.c.example-com.internal Ready 6m v1.7.5+coreos.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.5+coreos.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.5+coreos.0 +yavin-controller-1682.c.example-com.internal Ready 6m v1.7.7+coreos.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.7+coreos.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.7+coreos.0 ``` List the pods. diff --git a/aws/container-linux/kubernetes/README.md b/aws/container-linux/kubernetes/README.md index f379f5ad..dd961e75 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.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.7.7 (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, Dashboards, Metrics, and other optional [addons](https://typhoon.psdn.io/addons/overview/) diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 3a765753..1f806d9b 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/bootkube-terraform.git?ref=d93b7e4dc872040a3615e22ed135055df7753f19" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.7.0" 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 37086e03..2e662def 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -105,7 +105,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -128,7 +128,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/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_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.7.0}" BOOTKUBE_ASSETS="$${BOOTKUBE_ASSETS:-/opt/bootkube/assets}" exec /usr/bin/rkt run \ --trust-keys-from-https \ diff --git a/aws/container-linux/kubernetes/cl/worker.yaml.tmpl b/aws/container-linux/kubernetes/cl/worker.yaml.tmpl index 2b959cda..11e6b73c 100644 --- a/aws/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -103,7 +103,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -120,7 +120,7 @@ storage: --trust-keys-from-https \ --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ - quay.io/coreos/hyperkube:v1.7.5_coreos.0 \ + quay.io/coreos/hyperkube:v1.7.7_coreos.0 \ --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 0afb7616..e7b619cc 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.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.7.7 (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, Dashboards, Metrics, 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 2ba3eac9..a09b3d83 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/bootkube-terraform.git?ref=d93b7e4dc872040a3615e22ed135055df7753f19" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.7.0" 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 16fdb76b..ea336ccf 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -130,7 +130,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/hostname filesystem: root mode: 0644 @@ -159,7 +159,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/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_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.7.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 84e852fc..fddf92f7 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -96,7 +96,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/hostname filesystem: root mode: 0644 diff --git a/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl b/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl index b7fec5eb..5b8ffe96 100644 --- a/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl +++ b/bare-metal/container-linux/pxe-worker/cl/bootkube-worker.yaml.tmpl @@ -96,7 +96,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - 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 f8d355ab..fcef1e79 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.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.7.7 (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, Dashboards, Metrics, 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 407ba359..5b376f57 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/bootkube-terraform.git?ref=d93b7e4dc872040a3615e22ed135055df7753f19" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.7.0" 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 ef702b08..8fa36ba8 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -96,7 +96,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -119,7 +119,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/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_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.7.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 fe4e91b1..e56fcccc 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=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -111,7 +111,7 @@ storage: --trust-keys-from-https \ --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ - quay.io/coreos/hyperkube:v1.7.5_coreos.0 \ + quay.io/coreos/hyperkube:v1.7.7_coreos.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/docs/aws.md b/docs/aws.md index be52280d..c08a1293 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -1,6 +1,6 @@ # AWS -In this tutorial, we'll create a Kubernetes v1.7.5 cluster on AWS. +In this tutorial, we'll create a Kubernetes v1.7.7 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. @@ -125,7 +125,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.6.2 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) ``` Plan the resources to be created. @@ -160,9 +160,9 @@ In 10-20 minutes, the Kubernetes cluster will be ready. $ KUBECONFIG=/home/user/.secrets/clusters/tempest/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -ip-10-0-12-221 Ready 34m v1.7.5+coreos.0 -ip-10-0-19-112 Ready 34m v1.7.5+coreos.0 -ip-10-0-4-22 Ready 34m v1.7.5+coreos.0 +ip-10-0-12-221 Ready 34m v1.7.7+coreos.0 +ip-10-0-19-112 Ready 34m v1.7.7+coreos.0 +ip-10-0-4-22 Ready 34m v1.7.7+coreos.0 ``` List the pods. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index 6d03e479..84fb0867 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 provison a Kubernetes v1.7.5 cluster on bare-metal. +In this tutorial, we'll network boot and provison a Kubernetes v1.7.7 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. @@ -228,7 +228,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.6.2 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) ``` Plan the resources to be created. @@ -304,9 +304,9 @@ bootkube[5]: Tearing down temporary bootstrap control plane... $ KUBECONFIG=/home/user/.secrets/clusters/mercury/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -node1.example.com Ready 11m v1.7.5+coreos.0 -node2.example.com Ready 11m v1.7.5+coreos.0 -node3.example.com Ready 11m v1.7.5+coreos.0 +node1.example.com Ready 11m v1.7.7+coreos.0 +node2.example.com Ready 11m v1.7.7+coreos.0 +node3.example.com Ready 11m v1.7.7+coreos.0 ``` List the pods. diff --git a/docs/concepts.md b/docs/concepts.md index 4b4a08f9..e30063bc 100644 --- a/docs/concepts.md +++ b/docs/concepts.md @@ -60,7 +60,7 @@ Modules are updated regularly, set the version to a [release tag](https://github ```tf ... -source = "git:https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.7.5" +source = "git:https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.7.7" ``` Module versioning ensures `terraform get --update` only fetches the desired version, so plan and apply don't change cluster resources, unless the version is altered. diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index 7a127dbd..add163c1 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.7.5 cluster on Digital Ocean. +In this tutorial, we'll create a Kubernetes v1.7.7 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. @@ -114,7 +114,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.6.2 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) ``` Plan the resources to be created. @@ -147,9 +147,9 @@ In 5-10 minutes, the Kubernetes cluster will be ready. $ KUBECONFIG=/home/user/.secrets/clusters/nemo/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -10.132.110.130 Ready 10m v1.7.5+coreos.0 -10.132.115.81 Ready 10m v1.7.5+coreos.0 -10.132.124.107 Ready 10m v1.7.5+coreos.0 +10.132.110.130 Ready 10m v1.7.7+coreos.0 +10.132.115.81 Ready 10m v1.7.7+coreos.0 +10.132.124.107 Ready 10m v1.7.7+coreos.0 ``` List the pods. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 3e4295bb..dd00337b 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.7.5 cluster on Google Compute Engine (not GKE). +In this tutorial, we'll create a Kubernetes v1.7.7 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. @@ -120,7 +120,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.6.2 (update) +Get: git::https://github.com/poseidon/bootkube-terraform.git?ref=v0.7.0 (update) ``` Plan the resources to be created. @@ -154,9 +154,9 @@ In 5-10 minutes, the Kubernetes cluster will be ready. $ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-1682.c.example-com.internal Ready 6m v1.7.5+coreos.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.5+coreos.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.5+coreos.0 +yavin-controller-1682.c.example-com.internal Ready 6m v1.7.7+coreos.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.7+coreos.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.7+coreos.0 ``` List the pods. diff --git a/docs/index.md b/docs/index.md index 6fd018c5..514210bd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.7.7 (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, Dashboards, Metrics and other optional [addons](addons/overview.md) @@ -77,9 +77,9 @@ In 5-10 minutes (varies by platform), the cluster will be ready. This Google Clo $ KUBECONFIG=/home/user/.secrets/clusters/yavin/auth/kubeconfig $ kubectl get nodes NAME STATUS AGE VERSION -yavin-controller-1682.c.example-com.internal Ready 6m v1.7.5+coreos.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.5+coreos.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.5+coreos.0 +yavin-controller-1682.c.example-com.internal Ready 6m v1.7.7+coreos.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.7.7+coreos.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.7.7+coreos.0 ``` List the pods. diff --git a/google-cloud/container-linux/kubernetes/README.md b/google-cloud/container-linux/kubernetes/README.md index 6f5c80bf..9e7b8a9c 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.7.5 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.7.7 (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, Dashboards, Metrics, 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 407ba359..5b376f57 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/bootkube-terraform.git?ref=d93b7e4dc872040a3615e22ed135055df7753f19" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=v0.7.0" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl index e4749e13..c9a8bd2b 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -105,7 +105,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -128,7 +128,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/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_VERSION="$${BOOTKUBE_VERSION:-v0.6.2}" + BOOTKUBE_VERSION="$${BOOTKUBE_VERSION:-v0.7.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 2b959cda..11e6b73c 100644 --- a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -103,7 +103,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=quay.io/coreos/hyperkube - KUBELET_IMAGE_TAG=v1.7.5_coreos.0 + KUBELET_IMAGE_TAG=v1.7.7_coreos.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -120,7 +120,7 @@ storage: --trust-keys-from-https \ --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ - quay.io/coreos/hyperkube:v1.7.5_coreos.0 \ + quay.io/coreos/hyperkube:v1.7.7_coreos.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)