diff --git a/CHANGES.md b/CHANGES.md index 08c2b6d9..50a2fd1d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,9 +4,12 @@ Notable changes between versions. ## Latest +* Kubernetes [v1.9.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md#v193) * Network improvements and fixes - * Switch from Calico v2.6.6 to v3.0.1 + * Switch from Calico v2.6.6 to v3.0.2 + * Add Calico GlobalNetworkSet CRD * Update flannel from v0.9.0 to v0.10.0 + * Use separate service account for flannel * Update etcd from v3.2.14 to v3.2.15 #### Addons diff --git a/README.md b/README.md index 4f33baf1..c9933126 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.9.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.9.3 (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/) @@ -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.9.2 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.9.2 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.9.2 +yavin-controller-0.c.example-com.internal Ready 6m v1.9.3 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.9.3 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.9.3 ``` List the pods. diff --git a/aws/container-linux/kubernetes/README.md b/aws/container-linux/kubernetes/README.md index 08757a62..a71b0de2 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.9.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.9.3 (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 43f37b15..645704d2 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=8d40d6c64d5365d14e490bc5fb231dc45a0d2371" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=203b90169ead2380f74cc64ea1f02c109806c9bc" 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 ca839b89..9899fa32 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -129,7 +129,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: diff --git a/aws/container-linux/kubernetes/cl/worker.yaml.tmpl b/aws/container-linux/kubernetes/cl/worker.yaml.tmpl index 1189ba17..994794d6 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=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -121,7 +121,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://gcr.io/google_containers/hyperkube:v1.9.2 \ + docker://gcr.io/google_containers/hyperkube:v1.9.3 \ --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 899edbbd..93c5ae2f 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.9.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.9.3 (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 12e08ad4..2ba3303d 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=8d40d6c64d5365d14e490bc5fb231dc45a0d2371" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=203b90169ead2380f74cc64ea1f02c109806c9bc" 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 14b2eb1b..38e21569 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -117,7 +117,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - path: /etc/hostname filesystem: root mode: 0644 diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl index 3c19970b..4fe483bb 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -82,7 +82,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - 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 53b49841..6ccaf454 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 @@ -98,7 +98,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - 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 1dab94e9..0456abdd 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.9.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.9.3 (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 2edb9bc4..9125e94d 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=8d40d6c64d5365d14e490bc5fb231dc45a0d2371" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=203b90169ead2380f74cc64ea1f02c109806c9bc" 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 edaccfd8..625a5b58 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -120,7 +120,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl index 1e07f5f1..12679cd2 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://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - 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://gcr.io/google_containers/hyperkube:v1.9.2 \ + docker://gcr.io/google_containers/hyperkube:v1.9.3 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/docs/aws.md b/docs/aws.md index fb2ff714..dc63f300 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -1,6 +1,6 @@ # AWS -In this tutorial, we'll create a Kubernetes v1.9.2 cluster on AWS. +In this tutorial, we'll create a Kubernetes v1.9.3 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.9.2" + source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes?ref=v1.9.3" providers = { aws = "aws.default" @@ -182,9 +182,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.9.2 -ip-10-0-19-112 Ready 34m v1.9.2 -ip-10-0-4-22 Ready 34m v1.9.2 +ip-10-0-12-221 Ready 34m v1.9.3 +ip-10-0-19-112 Ready 34m v1.9.3 +ip-10-0-4-22 Ready 34m v1.9.3 ``` List the pods. diff --git a/docs/bare-metal.md b/docs/bare-metal.md index 9c1c78df..70622282 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.9.2 cluster on bare-metal. +In this tutorial, we'll network boot and provision a Kubernetes v1.9.3 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. @@ -177,7 +177,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.9.2" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.9.3" providers = { local = "local.default" @@ -317,9 +317,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.9.2 -node2.example.com Ready 11m v1.9.2 -node3.example.com Ready 11m v1.9.2 +node1.example.com Ready 11m v1.9.3 +node2.example.com Ready 11m v1.9.3 +node3.example.com Ready 11m v1.9.3 ``` List the pods. diff --git a/docs/digital-ocean.md b/docs/digital-ocean.md index 60bd8fcb..353c0237 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.9.2 cluster on Digital Ocean. +In this tutorial, we'll create a Kubernetes v1.9.3 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.9.2" + source = "git::https://github.com/poseidon/typhoon//digital-ocean/container-linux/kubernetes?ref=v1.9.3" providers = { digitalocean = "digitalocean.default" @@ -177,9 +177,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.9.2 -10.132.115.81 Ready 10m v1.9.2 -10.132.124.107 Ready 10m v1.9.2 +10.132.110.130 Ready 10m v1.9.3 +10.132.115.81 Ready 10m v1.9.3 +10.132.124.107 Ready 10m v1.9.3 ``` List the pods. diff --git a/docs/google-cloud.md b/docs/google-cloud.md index 45224a49..2a155adb 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.9.2 cluster on Google Compute Engine (not GKE). +In this tutorial, we'll create a Kubernetes v1.9.3 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.9.2" + source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.9.3" providers = { google = "google.default" @@ -185,9 +185,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.9.2 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.9.2 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.9.2 +yavin-controller-0.c.example-com.internal Ready 6m v1.9.3 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.9.3 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.9.3 ``` List the pods. diff --git a/docs/index.md b/docs/index.md index dfa3d988..67bfdab4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.9.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.9.3 (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) @@ -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.9.2 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.9.2 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.9.2 +yavin-controller-0.c.example-com.internal Ready 6m v1.9.3 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.9.3 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.9.3 ``` List the pods. diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 15f6bbd6..db5d3fa3 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.9.2" + source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.9.3" ... } ``` diff --git a/google-cloud/container-linux/kubernetes/README.md b/google-cloud/container-linux/kubernetes/README.md index 585a9e1a..4025cd49 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.9.2 (upstream, via [kubernetes-incubator/bootkube](https://github.com/kubernetes-incubator/bootkube)) +* Kubernetes v1.9.3 (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 bb3dc2d4..67a2586a 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=8d40d6c64d5365d14e490bc5fb231dc45a0d2371" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=203b90169ead2380f74cc64ea1f02c109806c9bc" 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 8fb11d18..773f8c98 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -130,7 +130,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: 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 4f9bcc64..80934cb2 100644 --- a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -104,7 +104,7 @@ storage: contents: inline: | KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube - KUBELET_IMAGE_TAG=v1.9.2 + KUBELET_IMAGE_TAG=v1.9.3 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root contents: @@ -122,7 +122,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://gcr.io/google_containers/hyperkube:v1.9.2 \ + docker://gcr.io/google_containers/hyperkube:v1.9.3 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)