From a8b8a9b45462f0235c70c5a8d196c27ffc06fb20 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 8 Dec 2020 18:26:10 -0800 Subject: [PATCH] Update Kubernetes from v1.20.0-rc.0 to v1.20.0 * https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#v1200 --- CHANGES.md | 2 +- README.md | 10 ++++----- aws/fedora-coreos/kubernetes/README.md | 2 +- aws/fedora-coreos/kubernetes/bootstrap.tf | 2 +- .../kubernetes/fcc/controller.yaml | 4 ++-- .../kubernetes/workers/fcc/worker.yaml | 4 ++-- aws/flatcar-linux/kubernetes/README.md | 2 +- aws/flatcar-linux/kubernetes/bootstrap.tf | 2 +- .../kubernetes/cl/controller.yaml | 4 ++-- .../kubernetes/workers/cl/worker.yaml | 4 ++-- azure/fedora-coreos/kubernetes/README.md | 2 +- azure/fedora-coreos/kubernetes/bootstrap.tf | 2 +- .../kubernetes/fcc/controller.yaml | 4 ++-- .../kubernetes/workers/fcc/worker.yaml | 4 ++-- azure/flatcar-linux/kubernetes/README.md | 2 +- azure/flatcar-linux/kubernetes/bootstrap.tf | 2 +- .../kubernetes/cl/controller.yaml | 4 ++-- .../kubernetes/workers/cl/worker.yaml | 4 ++-- bare-metal/fedora-coreos/kubernetes/README.md | 2 +- .../fedora-coreos/kubernetes/bootstrap.tf | 2 +- .../kubernetes/fcc/controller.yaml | 4 ++-- .../fedora-coreos/kubernetes/fcc/worker.yaml | 2 +- bare-metal/flatcar-linux/kubernetes/README.md | 2 +- .../flatcar-linux/kubernetes/bootstrap.tf | 2 +- .../kubernetes/cl/controller.yaml | 4 ++-- .../flatcar-linux/kubernetes/cl/worker.yaml | 2 +- .../fedora-coreos/kubernetes/README.md | 2 +- .../fedora-coreos/kubernetes/bootstrap.tf | 2 +- .../kubernetes/fcc/controller.yaml | 4 ++-- .../fedora-coreos/kubernetes/fcc/worker.yaml | 4 ++-- .../flatcar-linux/kubernetes/README.md | 2 +- .../flatcar-linux/kubernetes/bootstrap.tf | 2 +- .../kubernetes/cl/controller.yaml | 4 ++-- .../flatcar-linux/kubernetes/cl/worker.yaml | 4 ++-- docs/advanced/worker-pools.md | 22 +++++++++---------- docs/fedora-coreos/aws.md | 10 ++++----- docs/fedora-coreos/azure.md | 10 ++++----- docs/fedora-coreos/bare-metal.md | 10 ++++----- docs/fedora-coreos/digitalocean.md | 10 ++++----- docs/fedora-coreos/google-cloud.md | 8 +++---- docs/flatcar-linux/aws.md | 10 ++++----- docs/flatcar-linux/azure.md | 10 ++++----- docs/flatcar-linux/bare-metal.md | 10 ++++----- docs/flatcar-linux/digitalocean.md | 10 ++++----- docs/flatcar-linux/google-cloud.md | 10 ++++----- docs/index.md | 10 ++++----- docs/topics/maintenance.md | 4 ++-- .../fedora-coreos/kubernetes/README.md | 2 +- .../fedora-coreos/kubernetes/bootstrap.tf | 2 +- .../kubernetes/fcc/controller.yaml | 4 ++-- .../kubernetes/workers/fcc/worker.yaml | 4 ++-- .../flatcar-linux/kubernetes/README.md | 2 +- .../flatcar-linux/kubernetes/bootstrap.tf | 2 +- .../kubernetes/cl/controller.yaml | 4 ++-- .../kubernetes/workers/cl/worker.yaml | 4 ++-- 55 files changed, 131 insertions(+), 131 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7c152c0e..ea63c55d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,7 @@ Notable changes between versions. ## Latest -* Kubernetes [v1.20.0-rc.0](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#v1200-rc0) +* Kubernetes [v1.20.0](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.20.md#v1200) * Add input variable validations ([#880](https://github.com/poseidon/typhoon/pull/880)) * Require Terraform v0.13+ ([migration guide](https://typhoon.psdn.io/topics/maintenance/#terraform-versions)) * Support Terraform v0.13.x and v0.14.x ([#905](https://github.com/poseidon/typhoon/pull/905)) diff --git a/README.md b/README.md index d53ed993..1ca02435 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), SELinux enforcing * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [preemptible](https://typhoon.psdn.io/flatcar-linux/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization @@ -54,7 +54,7 @@ Define a Kubernetes cluster by using the Terraform module for your chosen platfo ```tf module "yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=v1.20.0" # Google Cloud cluster_name = "yavin" @@ -93,9 +93,9 @@ In 4-8 minutes (varies by platform), the cluster will be ready. This Google Clou $ export KUBECONFIG=/home/user/.kube/configs/yavin-config $ kubectl get nodes NAME ROLES STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.20.0-rc.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0-rc.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0-rc.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.20.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0 ``` List the pods. diff --git a/aws/fedora-coreos/kubernetes/README.md b/aws/fedora-coreos/kubernetes/README.md index bf2a78fb..a4d56cd3 100644 --- a/aws/fedora-coreos/kubernetes/README.md +++ b/aws/fedora-coreos/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), SELinux enforcing * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [spot](https://typhoon.psdn.io/fedora-coreos/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/aws/fedora-coreos/kubernetes/bootstrap.tf b/aws/fedora-coreos/kubernetes/bootstrap.tf index cd153a27..4319927a 100644 --- a/aws/fedora-coreos/kubernetes/bootstrap.tf +++ b/aws/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 972e2047..ef3c7dc1 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -52,7 +52,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -119,7 +119,7 @@ systemd: --volume /opt/bootstrap/assets:/assets:ro,Z \ --volume /opt/bootstrap/apply:/apply:ro,Z \ --entrypoint=/apply \ - quay.io/poseidon/kubelet:v1.20.0-rc.0 + quay.io/poseidon/kubelet:v1.20.0 ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done ExecStartPost=-/usr/bin/podman stop bootstrap storage: diff --git a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml index eb1afaff..7a908a50 100644 --- a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -25,7 +25,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -87,7 +87,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/aws/flatcar-linux/kubernetes/README.md b/aws/flatcar-linux/kubernetes/README.md index 70ec1ff0..435caf1c 100644 --- a/aws/flatcar-linux/kubernetes/README.md +++ b/aws/flatcar-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), [spot](https://typhoon.psdn.io/flatcar-linux/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/aws/flatcar-linux/kubernetes/bootstrap.tf b/aws/flatcar-linux/kubernetes/bootstrap.tf index 34abc203..f1a134f9 100644 --- a/aws/flatcar-linux/kubernetes/bootstrap.tf +++ b/aws/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml index 7987067d..abc46aaa 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml @@ -55,7 +55,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Environment=KUBELET_CGROUP_DRIVER=${cgroup_driver} ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -117,7 +117,7 @@ systemd: Type=oneshot RemainAfterExit=true WorkingDirectory=/opt/bootstrap - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStart=/usr/bin/docker run \ -v /etc/kubernetes/pki:/etc/kubernetes/pki:ro \ -v /opt/bootstrap/assets:/assets:ro \ diff --git a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml index 847e0b9c..fa823c35 100644 --- a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -27,7 +27,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Environment=KUBELET_CGROUP_DRIVER=${cgroup_driver} ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -89,7 +89,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/azure/fedora-coreos/kubernetes/README.md b/azure/fedora-coreos/kubernetes/README.md index 3cd2a7e2..8e0be80f 100644 --- a/azure/fedora-coreos/kubernetes/README.md +++ b/azure/fedora-coreos/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), SELinux enforcing * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [spot priority](https://typhoon.psdn.io/fedora-coreos/azure/#low-priority) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/azure/fedora-coreos/kubernetes/bootstrap.tf b/azure/fedora-coreos/kubernetes/bootstrap.tf index 8d7f0aba..a63d387e 100644 --- a/azure/fedora-coreos/kubernetes/bootstrap.tf +++ b/azure/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/fcc/controller.yaml index d42bce4d..a3c6cbb8 100644 --- a/azure/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/azure/fedora-coreos/kubernetes/fcc/controller.yaml @@ -51,7 +51,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -118,7 +118,7 @@ systemd: --volume /opt/bootstrap/assets:/assets:ro,Z \ --volume /opt/bootstrap/apply:/apply:ro,Z \ --entrypoint=/apply \ - quay.io/poseidon/kubelet:v1.20.0-rc.0 + quay.io/poseidon/kubelet:v1.20.0 ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done ExecStartPost=-/usr/bin/podman stop bootstrap storage: diff --git a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 8b53ac40..c7bd85c2 100644 --- a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -24,7 +24,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -83,7 +83,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/azure/flatcar-linux/kubernetes/README.md b/azure/flatcar-linux/kubernetes/README.md index 8a0832c6..b700e637 100644 --- a/azure/flatcar-linux/kubernetes/README.md +++ b/azure/flatcar-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), [low-priority](https://typhoon.psdn.io/flatcar-linux/azure/#low-priority) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/azure/flatcar-linux/kubernetes/bootstrap.tf b/azure/flatcar-linux/kubernetes/bootstrap.tf index 22e9e48f..49117029 100644 --- a/azure/flatcar-linux/kubernetes/bootstrap.tf +++ b/azure/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/flatcar-linux/kubernetes/cl/controller.yaml b/azure/flatcar-linux/kubernetes/cl/controller.yaml index 7987067d..abc46aaa 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml @@ -55,7 +55,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Environment=KUBELET_CGROUP_DRIVER=${cgroup_driver} ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -117,7 +117,7 @@ systemd: Type=oneshot RemainAfterExit=true WorkingDirectory=/opt/bootstrap - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStart=/usr/bin/docker run \ -v /etc/kubernetes/pki:/etc/kubernetes/pki:ro \ -v /opt/bootstrap/assets:/assets:ro \ diff --git a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml index 847e0b9c..fa823c35 100644 --- a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -27,7 +27,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Environment=KUBELET_CGROUP_DRIVER=${cgroup_driver} ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -89,7 +89,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/bare-metal/fedora-coreos/kubernetes/README.md b/bare-metal/fedora-coreos/kubernetes/README.md index b55cca4e..e8ae1d6a 100644 --- a/bare-metal/fedora-coreos/kubernetes/README.md +++ b/bare-metal/fedora-coreos/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), SELinux enforcing * Advanced features like [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf index 4a9e2c3a..386acdbf 100644 --- a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf +++ b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index daa1477c..dc317d66 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -50,7 +50,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -129,7 +129,7 @@ systemd: --volume /opt/bootstrap/assets:/assets:ro,Z \ --volume /opt/bootstrap/apply:/apply:ro,Z \ --entrypoint=/apply \ - quay.io/poseidon/kubelet:v1.20.0-rc.0 + quay.io/poseidon/kubelet:v1.20.0 ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done ExecStartPost=-/usr/bin/podman stop bootstrap storage: diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml index 3595d861..6bb950f6 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml @@ -23,7 +23,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin diff --git a/bare-metal/flatcar-linux/kubernetes/README.md b/bare-metal/flatcar-linux/kubernetes/README.md index 4e823f7e..8dd1f37e 100644 --- a/bare-metal/flatcar-linux/kubernetes/README.md +++ b/bare-metal/flatcar-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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 [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf index e86dd048..c7b05aa1 100644 --- a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf +++ b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml index 9a28923a..1e16ecc7 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml @@ -63,7 +63,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Environment=KUBELET_CGROUP_DRIVER=${cgroup_driver} ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -128,7 +128,7 @@ systemd: Type=oneshot RemainAfterExit=true WorkingDirectory=/opt/bootstrap - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStart=/usr/bin/docker run \ -v /etc/kubernetes/pki:/etc/kubernetes/pki:ro \ -v /opt/bootstrap/assets:/assets:ro \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml index 1844b7e1..1f68c195 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml @@ -35,7 +35,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Environment=KUBELET_CGROUP_DRIVER=${cgroup_driver} ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests diff --git a/digital-ocean/fedora-coreos/kubernetes/README.md b/digital-ocean/fedora-coreos/kubernetes/README.md index 07051668..984fb203 100644 --- a/digital-ocean/fedora-coreos/kubernetes/README.md +++ b/digital-ocean/fedora-coreos/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [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/), SELinux enforcing * Advanced features like [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf index 40fce8d0..b432d654 100644 --- a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf +++ b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml index 048b7927..acf1dea9 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml @@ -52,7 +52,7 @@ systemd: After=afterburn.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 EnvironmentFile=/run/metadata/afterburn ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -130,7 +130,7 @@ systemd: --volume /opt/bootstrap/assets:/assets:ro,Z \ --volume /opt/bootstrap/apply:/apply:ro,Z \ --entrypoint=/apply \ - quay.io/poseidon/kubelet:v1.20.0-rc.0 + quay.io/poseidon/kubelet:v1.20.0 ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done ExecStartPost=-/usr/bin/podman stop bootstrap storage: diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml index 1afffe57..40565fc0 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml @@ -26,7 +26,7 @@ systemd: After=afterburn.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 EnvironmentFile=/run/metadata/afterburn ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -93,7 +93,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/digital-ocean/flatcar-linux/kubernetes/README.md b/digital-ocean/flatcar-linux/kubernetes/README.md index 835b41ef..10e97944 100644 --- a/digital-ocean/flatcar-linux/kubernetes/README.md +++ b/digital-ocean/flatcar-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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 [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf index a2f3d165..1c25076f 100644 --- a/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf +++ b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml index 690c509c..82625905 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml @@ -65,7 +65,7 @@ systemd: After=coreos-metadata.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 EnvironmentFile=/run/metadata/coreos ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -127,7 +127,7 @@ systemd: Type=oneshot RemainAfterExit=true WorkingDirectory=/opt/bootstrap - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStart=/usr/bin/docker run \ -v /etc/kubernetes/pki:/etc/kubernetes/pki:ro \ -v /opt/bootstrap/assets:/assets:ro \ diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml index c575a230..46264ee4 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml @@ -37,7 +37,7 @@ systemd: After=coreos-metadata.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 EnvironmentFile=/run/metadata/coreos ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests @@ -96,7 +96,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/docs/advanced/worker-pools.md b/docs/advanced/worker-pools.md index 1fa1a672..0d64a4c6 100644 --- a/docs/advanced/worker-pools.md +++ b/docs/advanced/worker-pools.md @@ -19,7 +19,7 @@ Create a cluster following the AWS [tutorial](../flatcar-linux/aws.md#cluster). ```tf module "tempest-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//aws/fedora-coreos/kubernetes/workers?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//aws/fedora-coreos/kubernetes/workers?ref=v1.20.0" # AWS vpc_id = module.tempest.vpc_id @@ -42,7 +42,7 @@ Create a cluster following the AWS [tutorial](../flatcar-linux/aws.md#cluster). ```tf module "tempest-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//aws/flatcar-linux/kubernetes/workers?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//aws/flatcar-linux/kubernetes/workers?ref=v1.20.0" # AWS vpc_id = module.tempest.vpc_id @@ -110,7 +110,7 @@ Create a cluster following the Azure [tutorial](../flatcar-linux/azure.md#cluste ```tf module "ramius-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//azure/fedora-coreos/kubernetes/workers?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//azure/fedora-coreos/kubernetes/workers?ref=v1.20.0" # Azure region = module.ramius.region @@ -136,7 +136,7 @@ Create a cluster following the Azure [tutorial](../flatcar-linux/azure.md#cluste ```tf module "ramius-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//azure/flatcar-linux/kubernetes/workers?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//azure/flatcar-linux/kubernetes/workers?ref=v1.20.0" # Azure region = module.ramius.region @@ -205,7 +205,7 @@ Create a cluster following the Google Cloud [tutorial](../flatcar-linux/google-c ```tf module "yavin-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes/workers?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes/workers?ref=v1.20.0" # Google Cloud region = "europe-west2" @@ -229,7 +229,7 @@ Create a cluster following the Google Cloud [tutorial](../flatcar-linux/google-c ```tf module "yavin-worker-pool" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes/workers?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes/workers?ref=v1.20.0" # Google Cloud region = "europe-west2" @@ -260,11 +260,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.20.0-rc.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0-rc.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0-rc.0 -yavin-16x-worker-jrbf.c.example-com.internal Ready 3m v1.20.0-rc.0 -yavin-16x-worker-mzdm.c.example-com.internal Ready 3m v1.20.0-rc.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.20.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0 +yavin-16x-worker-jrbf.c.example-com.internal Ready 3m v1.20.0 +yavin-16x-worker-mzdm.c.example-com.internal Ready 3m v1.20.0 ``` ### Variables diff --git a/docs/fedora-coreos/aws.md b/docs/fedora-coreos/aws.md index 839b3704..2e1ed40f 100644 --- a/docs/fedora-coreos/aws.md +++ b/docs/fedora-coreos/aws.md @@ -1,6 +1,6 @@ # AWS -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on AWS with Fedora CoreOS. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on AWS with Fedora CoreOS. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create a VPC, gateway, subnets, security groups, controller instances, worker auto-scaling group, network load balancer, and TLS assets. @@ -72,7 +72,7 @@ Define a Kubernetes cluster using the module `aws/fedora-coreos/kubernetes`. ```tf module "tempest" { - source = "git::https://github.com/poseidon/typhoon//aws/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//aws/fedora-coreos/kubernetes?ref=v1.20.0" # AWS cluster_name = "tempest" @@ -145,9 +145,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/tempest-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -ip-10-0-3-155 Ready 10m v1.20.0-rc.0 -ip-10-0-26-65 Ready 10m v1.20.0-rc.0 -ip-10-0-41-21 Ready 10m v1.20.0-rc.0 +ip-10-0-3-155 Ready 10m v1.20.0 +ip-10-0-26-65 Ready 10m v1.20.0 +ip-10-0-41-21 Ready 10m v1.20.0 ``` List the pods. diff --git a/docs/fedora-coreos/azure.md b/docs/fedora-coreos/azure.md index a906e494..146a4c42 100644 --- a/docs/fedora-coreos/azure.md +++ b/docs/fedora-coreos/azure.md @@ -1,6 +1,6 @@ # Azure -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on Azure with Fedora CoreOS. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on Azure with Fedora CoreOS. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create a resource group, virtual network, subnets, security groups, controller availability set, worker scale set, load balancer, and TLS assets. @@ -86,7 +86,7 @@ Define a Kubernetes cluster using the module `azure/fedora-coreos/kubernetes`. ```tf module "ramius" { - source = "git::https://github.com/poseidon/typhoon//azure/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//azure/fedora-coreos/kubernetes?ref=v1.20.0" # Azure cluster_name = "ramius" @@ -161,9 +161,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/ramius-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -ramius-controller-0 Ready 24m v1.20.0-rc.0 -ramius-worker-000001 Ready 25m v1.20.0-rc.0 -ramius-worker-000002 Ready 24m v1.20.0-rc.0 +ramius-controller-0 Ready 24m v1.20.0 +ramius-worker-000001 Ready 25m v1.20.0 +ramius-worker-000002 Ready 24m v1.20.0 ``` List the pods. diff --git a/docs/fedora-coreos/bare-metal.md b/docs/fedora-coreos/bare-metal.md index e3ce9569..028ace60 100644 --- a/docs/fedora-coreos/bare-metal.md +++ b/docs/fedora-coreos/bare-metal.md @@ -1,6 +1,6 @@ # Bare-Metal -In this tutorial, we'll network boot and provision a Kubernetes v1.20.0-rc.0 cluster on bare-metal with Fedora CoreOS. +In this tutorial, we'll network boot and provision a Kubernetes v1.20.0 cluster on bare-metal with Fedora CoreOS. First, we'll deploy a [Matchbox](https://github.com/poseidon/matchbox) service and setup a network boot environment. Then, we'll declare a Kubernetes cluster using the Typhoon Terraform module and power on machines. On PXE boot, machines will install Fedora CoreOS to disk, reboot into the disk install, and provision themselves as Kubernetes controllers or workers via Ignition. @@ -154,7 +154,7 @@ Define a Kubernetes cluster using the module `bare-metal/fedora-coreos/kubernete ```tf module "mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//bare-metal/fedora-coreos/kubernetes?ref=v1.20.0" # bare-metal cluster_name = "mercury" @@ -283,9 +283,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/mercury-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -node1.example.com Ready 10m v1.20.0-rc.0 -node2.example.com Ready 10m v1.20.0-rc.0 -node3.example.com Ready 10m v1.20.0-rc.0 +node1.example.com Ready 10m v1.20.0 +node2.example.com Ready 10m v1.20.0 +node3.example.com Ready 10m v1.20.0 ``` List the pods. diff --git a/docs/fedora-coreos/digitalocean.md b/docs/fedora-coreos/digitalocean.md index b2aa5835..dd08e48a 100644 --- a/docs/fedora-coreos/digitalocean.md +++ b/docs/fedora-coreos/digitalocean.md @@ -1,6 +1,6 @@ # DigitalOcean -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on DigitalOcean with Fedora CoreOS. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on DigitalOcean with Fedora CoreOS. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create controller droplets, worker droplets, DNS records, tags, and TLS assets. @@ -81,7 +81,7 @@ Define a Kubernetes cluster using the module `digital-ocean/fedora-coreos/kubern ```tf module "nemo" { - source = "git::https://github.com/poseidon/typhoon//digital-ocean/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//digital-ocean/fedora-coreos/kubernetes?ref=v1.20.0" # Digital Ocean cluster_name = "nemo" @@ -155,9 +155,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/nemo-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -10.132.110.130 Ready 10m v1.20.0-rc.0 -10.132.115.81 Ready 10m v1.20.0-rc.0 -10.132.124.107 Ready 10m v1.20.0-rc.0 +10.132.110.130 Ready 10m v1.20.0 +10.132.115.81 Ready 10m v1.20.0 +10.132.124.107 Ready 10m v1.20.0 ``` List the pods. diff --git a/docs/fedora-coreos/google-cloud.md b/docs/fedora-coreos/google-cloud.md index b5373c11..ce75a965 100644 --- a/docs/fedora-coreos/google-cloud.md +++ b/docs/fedora-coreos/google-cloud.md @@ -1,6 +1,6 @@ # Google Cloud -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on Google Compute Engine with Fedora CoreOS. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on Google Compute Engine with Fedora CoreOS. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create a network, firewall rules, health checks, controller instances, worker managed instance group, load balancers, and TLS assets. @@ -147,9 +147,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/yavin-config $ kubectl get nodes NAME ROLES STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.20.0-rc.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0-rc.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0-rc.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.20.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0 ``` List the pods. diff --git a/docs/flatcar-linux/aws.md b/docs/flatcar-linux/aws.md index b6896b30..f3904b35 100644 --- a/docs/flatcar-linux/aws.md +++ b/docs/flatcar-linux/aws.md @@ -1,6 +1,6 @@ # AWS -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on AWS with Flatcar Linux. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on AWS with Flatcar Linux. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create a VPC, gateway, subnets, security groups, controller instances, worker auto-scaling group, network load balancer, and TLS assets. @@ -72,7 +72,7 @@ Define a Kubernetes cluster using the module `aws/flatcar-linux/kubernetes`. ```tf module "tempest" { - source = "git::https://github.com/poseidon/typhoon//aws/flatcar-linux/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//aws/flatcar-linux/kubernetes?ref=v1.20.0" # AWS cluster_name = "tempest" @@ -145,9 +145,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/tempest-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -ip-10-0-3-155 Ready 10m v1.20.0-rc.0 -ip-10-0-26-65 Ready 10m v1.20.0-rc.0 -ip-10-0-41-21 Ready 10m v1.20.0-rc.0 +ip-10-0-3-155 Ready 10m v1.20.0 +ip-10-0-26-65 Ready 10m v1.20.0 +ip-10-0-41-21 Ready 10m v1.20.0 ``` List the pods. diff --git a/docs/flatcar-linux/azure.md b/docs/flatcar-linux/azure.md index 6eee61eb..3d857577 100644 --- a/docs/flatcar-linux/azure.md +++ b/docs/flatcar-linux/azure.md @@ -1,6 +1,6 @@ # Azure -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on Azure with Flatcar Linux. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on Azure with Flatcar Linux. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create a resource group, virtual network, subnets, security groups, controller availability set, worker scale set, load balancer, and TLS assets. @@ -75,7 +75,7 @@ Define a Kubernetes cluster using the module `azure/flatcar-linux/kubernetes`. ```tf module "ramius" { - source = "git::https://github.com/poseidon/typhoon//azure/flatcar-linux/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//azure/flatcar-linux/kubernetes?ref=v1.20.0" # Azure cluster_name = "ramius" @@ -149,9 +149,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/ramius-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -ramius-controller-0 Ready 24m v1.20.0-rc.0 -ramius-worker-000001 Ready 25m v1.20.0-rc.0 -ramius-worker-000002 Ready 24m v1.20.0-rc.0 +ramius-controller-0 Ready 24m v1.20.0 +ramius-worker-000001 Ready 25m v1.20.0 +ramius-worker-000002 Ready 24m v1.20.0 ``` List the pods. diff --git a/docs/flatcar-linux/bare-metal.md b/docs/flatcar-linux/bare-metal.md index 68ea10fd..d9525973 100644 --- a/docs/flatcar-linux/bare-metal.md +++ b/docs/flatcar-linux/bare-metal.md @@ -1,6 +1,6 @@ # Bare-Metal -In this tutorial, we'll network boot and provision a Kubernetes v1.20.0-rc.0 cluster on bare-metal with Flatcar Linux. +In this tutorial, we'll network boot and provision a Kubernetes v1.20.0 cluster on bare-metal with Flatcar Linux. First, we'll deploy a [Matchbox](https://github.com/poseidon/matchbox) service and setup a network boot environment. Then, we'll declare a Kubernetes cluster 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 via Ignition. @@ -154,7 +154,7 @@ Define a Kubernetes cluster using the module `bare-metal/flatcar-linux/kubernete ```tf module "mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes?ref=v1.20.0" # bare-metal cluster_name = "mercury" @@ -293,9 +293,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/mercury-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -node1.example.com Ready 10m v1.20.0-rc.0 -node2.example.com Ready 10m v1.20.0-rc.0 -node3.example.com Ready 10m v1.20.0-rc.0 +node1.example.com Ready 10m v1.20.0 +node2.example.com Ready 10m v1.20.0 +node3.example.com Ready 10m v1.20.0 ``` List the pods. diff --git a/docs/flatcar-linux/digitalocean.md b/docs/flatcar-linux/digitalocean.md index 57f974e4..b0a3dc4b 100644 --- a/docs/flatcar-linux/digitalocean.md +++ b/docs/flatcar-linux/digitalocean.md @@ -1,6 +1,6 @@ # DigitalOcean -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on DigitalOcean with Flatcar Linux. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on DigitalOcean with Flatcar Linux. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create controller droplets, worker droplets, DNS records, tags, and TLS assets. @@ -81,7 +81,7 @@ Define a Kubernetes cluster using the module `digital-ocean/flatcar-linux/kubern ```tf module "nemo" { - source = "git::https://github.com/poseidon/typhoon//digital-ocean/flatcar-linux/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//digital-ocean/flatcar-linux/kubernetes?ref=v1.20.0" # Digital Ocean cluster_name = "nemo" @@ -155,9 +155,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/nemo-config $ kubectl get nodes NAME STATUS ROLES AGE VERSION -10.132.110.130 Ready 10m v1.20.0-rc.0 -10.132.115.81 Ready 10m v1.20.0-rc.0 -10.132.124.107 Ready 10m v1.20.0-rc.0 +10.132.110.130 Ready 10m v1.20.0 +10.132.115.81 Ready 10m v1.20.0 +10.132.124.107 Ready 10m v1.20.0 ``` List the pods. diff --git a/docs/flatcar-linux/google-cloud.md b/docs/flatcar-linux/google-cloud.md index 3812bd61..98d0ff19 100644 --- a/docs/flatcar-linux/google-cloud.md +++ b/docs/flatcar-linux/google-cloud.md @@ -1,6 +1,6 @@ # Google Cloud -In this tutorial, we'll create a Kubernetes v1.20.0-rc.0 cluster on Google Compute Engine with Flatcar Linux. +In this tutorial, we'll create a Kubernetes v1.20.0 cluster on Google Compute Engine with Flatcar Linux. We'll declare a Kubernetes cluster using the Typhoon Terraform module. Then apply the changes to create a network, firewall rules, health checks, controller instances, worker managed instance group, load balancers, and TLS assets. @@ -92,7 +92,7 @@ Define a Kubernetes cluster using the module `google-cloud/flatcar-linux/kuberne ```tf module "yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes?ref=v1.20.0" # Google Cloud cluster_name = "yavin" @@ -167,9 +167,9 @@ List nodes in the cluster. $ export KUBECONFIG=/home/user/.kube/configs/yavin-config $ kubectl get nodes NAME ROLES STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.20.0-rc.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0-rc.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0-rc.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.20.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0 ``` List the pods. diff --git a/docs/index.md b/docs/index.md index b99e3a09..64fd7d89 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), SELinux enforcing * Advanced features like [worker pools](advanced/worker-pools/), [preemptible](fedora-coreos/google-cloud/#preemption) workers, and [snippets](advanced/customization/#hosts) customization @@ -53,7 +53,7 @@ Define a Kubernetes cluster by using the Terraform module for your chosen platfo ```tf module "yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=v1.20.0" # Google Cloud cluster_name = "yavin" @@ -91,9 +91,9 @@ In 4-8 minutes (varies by platform), the cluster will be ready. This Google Clou $ export KUBECONFIG=/home/user/.kube/configs/yavin-config $ kubectl get nodes NAME ROLES STATUS AGE VERSION -yavin-controller-0.c.example-com.internal Ready 6m v1.20.0-rc.0 -yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0-rc.0 -yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0-rc.0 +yavin-controller-0.c.example-com.internal Ready 6m v1.20.0 +yavin-worker-jrbf.c.example-com.internal Ready 5m v1.20.0 +yavin-worker-mzdm.c.example-com.internal Ready 5m v1.20.0 ``` List the pods. diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 72be9670..5fc874c6 100644 --- a/docs/topics/maintenance.md +++ b/docs/topics/maintenance.md @@ -13,12 +13,12 @@ Typhoon provides tagged releases to allow clusters to be versioned using ordinar ``` module "yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=v1.20.0" ... } module "mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes?ref=v1.20.0-rc.0" + source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes?ref=v1.20.0" ... } ``` diff --git a/google-cloud/fedora-coreos/kubernetes/README.md b/google-cloud/fedora-coreos/kubernetes/README.md index 12a78a59..51b3204c 100644 --- a/google-cloud/fedora-coreos/kubernetes/README.md +++ b/google-cloud/fedora-coreos/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), SELinux enforcing * Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [preemptible](https://typhoon.psdn.io/fedora-coreos/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf index 98baeddd..c89a67c3 100644 --- a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf +++ b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index 17818375..c96d3204 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -51,7 +51,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -118,7 +118,7 @@ systemd: --volume /opt/bootstrap/assets:/assets:ro,Z \ --volume /opt/bootstrap/apply:/apply:ro,Z \ --entrypoint=/apply \ - quay.io/poseidon/kubelet:v1.20.0-rc.0 + quay.io/poseidon/kubelet:v1.20.0 ExecStartPost=/bin/touch /opt/bootstrap/bootstrap.done ExecStartPost=-/usr/bin/podman stop bootstrap storage: diff --git a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 6d27f2e1..033652fc 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -24,7 +24,7 @@ systemd: Description=Kubelet (System Container) Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -83,7 +83,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true diff --git a/google-cloud/flatcar-linux/kubernetes/README.md b/google-cloud/flatcar-linux/kubernetes/README.md index a16db589..59c2995f 100644 --- a/google-cloud/flatcar-linux/kubernetes/README.md +++ b/google-cloud/flatcar-linux/kubernetes/README.md @@ -11,7 +11,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster ## Features -* Kubernetes v1.20.0-rc.0 (upstream) +* Kubernetes v1.20.0 (upstream) * Single or multi-master, [Calico](https://www.projectcalico.org/) or [Cilium](https://github.com/cilium/cilium) 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/), [preemptible](https://typhoon.psdn.io/flatcar-linux/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization diff --git a/google-cloud/flatcar-linux/kubernetes/bootstrap.tf b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf index e18ee063..c653de21 100644 --- a/google-cloud/flatcar-linux/kubernetes/bootstrap.tf +++ b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=64793aa593c5298c9ade7c599148d411afc498fc" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=c052741cc3d1f078e7823931f675264e36536bfa" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml index dfb947bd..c6870861 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml @@ -55,7 +55,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -115,7 +115,7 @@ systemd: Type=oneshot RemainAfterExit=true WorkingDirectory=/opt/bootstrap - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStart=/usr/bin/docker run \ -v /etc/kubernetes/pki:/etc/kubernetes/pki:ro \ -v /opt/bootstrap/assets:/assets:ro \ diff --git a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml index c5e9725a..33e8e3ed 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -27,7 +27,7 @@ systemd: After=docker.service Wants=rpc-statd.service [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin @@ -87,7 +87,7 @@ systemd: [Unit] Description=Delete Kubernetes node on shutdown [Service] - Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0-rc.0 + Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.0 Type=oneshot RemainAfterExit=true ExecStart=/bin/true