From 7c3f3ab6d0810bdb91ecee4ff1e03bf4c89994b4 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 20 Oct 2020 22:47:19 -0700 Subject: [PATCH] Rename container-linux modules to flatcar-linux * CoreOS Container Linux was deprecated in v1.18.3 * Continue transitioning docs and modules from supporting both CoreOS and Flatcar "variants" of Container Linux to now supporting Flatcar Linux and equivalents Action Required: Update the Flatcar Linux modules `source` to replace `s/container-linux/flatcar-linux`. See docs for examples --- CHANGES.md | 1 + README.md | 12 ++++++------ aws/fedora-coreos/kubernetes/README.md | 2 +- .../kubernetes/LICENSE | 0 .../kubernetes/README.md | 2 +- .../kubernetes/ami.tf | 0 .../kubernetes/bootstrap.tf | 0 .../kubernetes/cl/controller.yaml | 0 .../kubernetes/controllers.tf | 0 .../kubernetes/network.tf | 0 .../kubernetes/nlb.tf | 0 .../kubernetes/outputs.tf | 0 .../kubernetes/security.tf | 0 .../kubernetes/ssh.tf | 0 .../kubernetes/variables.tf | 0 .../kubernetes/versions.tf | 0 .../kubernetes/workers.tf | 0 .../kubernetes/workers/ami.tf | 0 .../kubernetes/workers/cl/worker.yaml | 0 .../kubernetes/workers/ingress.tf | 0 .../kubernetes/workers/outputs.tf | 0 .../kubernetes/workers/variables.tf | 0 .../kubernetes/workers/versions.tf | 0 .../kubernetes/workers/workers.tf | 0 azure/fedora-coreos/kubernetes/README.md | 2 +- .../kubernetes/LICENSE | 0 .../kubernetes/README.md | 2 +- .../kubernetes/bootstrap.tf | 0 .../kubernetes/cl/controller.yaml | 0 .../kubernetes/controllers.tf | 0 .../kubernetes/lb.tf | 0 .../kubernetes/network.tf | 0 .../kubernetes/outputs.tf | 0 .../kubernetes/security.tf | 0 .../kubernetes/ssh.tf | 0 .../kubernetes/variables.tf | 0 .../kubernetes/versions.tf | 0 .../kubernetes/workers.tf | 0 .../kubernetes/workers/cl/worker.yaml | 0 .../kubernetes/workers/variables.tf | 0 .../kubernetes/workers/versions.tf | 0 .../kubernetes/workers/workers.tf | 0 bare-metal/fedora-coreos/kubernetes/README.md | 2 +- .../kubernetes/LICENSE | 0 .../kubernetes/README.md | 2 +- .../kubernetes/bootstrap.tf | 0 .../kubernetes/cl/controller.yaml | 0 .../kubernetes/cl/install.yaml | 0 .../kubernetes/cl/worker.yaml | 0 .../kubernetes/groups.tf | 0 .../kubernetes/outputs.tf | 0 .../kubernetes/profiles.tf | 0 .../kubernetes/ssh.tf | 0 .../kubernetes/variables.tf | 0 .../kubernetes/versions.tf | 0 .../fedora-coreos/kubernetes/README.md | 2 +- .../kubernetes/LICENSE | 0 .../kubernetes/README.md | 2 +- .../kubernetes/bootstrap.tf | 0 .../kubernetes/cl/controller.yaml | 0 .../kubernetes/cl/worker.yaml | 0 .../kubernetes/controllers.tf | 0 .../kubernetes/network.tf | 0 .../kubernetes/outputs.tf | 0 .../kubernetes/ssh.tf | 0 .../kubernetes/variables.tf | 0 .../kubernetes/versions.tf | 0 .../kubernetes/workers.tf | 0 docs/advanced/customization.md | 2 +- docs/advanced/worker-pools.md | 18 +++++++++--------- docs/architecture/concepts.md | 4 ++-- docs/flatcar-linux/aws.md | 8 ++++---- docs/flatcar-linux/azure.md | 8 ++++---- docs/flatcar-linux/bare-metal.md | 8 ++++---- docs/flatcar-linux/digitalocean.md | 8 ++++---- docs/flatcar-linux/google-cloud.md | 8 ++++---- docs/index.md | 12 ++++++------ docs/topics/maintenance.md | 6 +++--- .../fedora-coreos/kubernetes/README.md | 2 +- .../kubernetes/LICENSE | 0 .../kubernetes/README.md | 2 +- .../kubernetes/apiserver.tf | 0 .../kubernetes/bootstrap.tf | 0 .../kubernetes/cl/controller.yaml | 0 .../kubernetes/controllers.tf | 0 .../kubernetes/ingress.tf | 0 .../kubernetes/network.tf | 0 .../kubernetes/outputs.tf | 0 .../kubernetes/ssh.tf | 0 .../kubernetes/variables.tf | 0 .../kubernetes/versions.tf | 0 .../kubernetes/workers.tf | 0 .../kubernetes/workers/cl/worker.yaml | 0 .../kubernetes/workers/outputs.tf | 0 .../kubernetes/workers/target_pool.tf | 0 .../kubernetes/workers/variables.tf | 0 .../kubernetes/workers/versions.tf | 0 .../kubernetes/workers/workers.tf | 0 98 files changed, 58 insertions(+), 57 deletions(-) rename aws/{container-linux => flatcar-linux}/kubernetes/LICENSE (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/README.md (97%) rename aws/{container-linux => flatcar-linux}/kubernetes/ami.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/bootstrap.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/cl/controller.yaml (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/controllers.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/network.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/nlb.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/outputs.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/security.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/ssh.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/variables.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/versions.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/ami.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/cl/worker.yaml (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/ingress.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/outputs.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/variables.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/versions.tf (100%) rename aws/{container-linux => flatcar-linux}/kubernetes/workers/workers.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/LICENSE (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/README.md (96%) rename azure/{container-linux => flatcar-linux}/kubernetes/bootstrap.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/cl/controller.yaml (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/controllers.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/lb.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/network.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/outputs.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/security.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/ssh.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/variables.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/versions.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/workers.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/workers/cl/worker.yaml (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/workers/variables.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/workers/versions.tf (100%) rename azure/{container-linux => flatcar-linux}/kubernetes/workers/workers.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/LICENSE (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/README.md (96%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/bootstrap.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/cl/controller.yaml (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/cl/install.yaml (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/cl/worker.yaml (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/groups.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/outputs.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/profiles.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/ssh.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/variables.tf (100%) rename bare-metal/{container-linux => flatcar-linux}/kubernetes/versions.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/LICENSE (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/README.md (96%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/bootstrap.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/cl/controller.yaml (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/cl/worker.yaml (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/controllers.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/network.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/outputs.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/ssh.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/variables.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/versions.tf (100%) rename digital-ocean/{container-linux => flatcar-linux}/kubernetes/workers.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/LICENSE (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/README.md (95%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/apiserver.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/bootstrap.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/cl/controller.yaml (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/controllers.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/ingress.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/network.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/outputs.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/ssh.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/variables.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/versions.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers/cl/worker.yaml (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers/outputs.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers/target_pool.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers/variables.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers/versions.tf (100%) rename google-cloud/{container-linux => flatcar-linux}/kubernetes/workers/workers.tf (100%) diff --git a/CHANGES.md b/CHANGES.md index 3199baab..0ea275d0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Notable changes between versions. ### Flatcar Linux +* Rename `container-linux` modules to `flatcar-linux` ([#858](https://github.com/poseidon/typhoon/issues/858)) (action required) * Change `kubelet.service` container runner from rkt to docker ([#855](https://github.com/poseidon/typhoon/pull/855)) * Change `delete-node.service` to use docker and an inline ExecStart ([#855](https://github.com/poseidon/typhoon/pull/855)) * Fix local node delete oneshot on node shutdown ([#855](https://github.com/poseidon/typhoon/pull/855)) diff --git a/README.md b/README.md index 3f3966d3..9cf13c33 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/cl/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization +* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [preemptible](https://typhoon.psdn.io/cl/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, or other [addons](https://typhoon.psdn.io/addons/overview/) ## Modules @@ -35,11 +35,11 @@ Typhoon is available for [Flatcar Linux](https://www.flatcar-linux.org/releases/ | Platform | Operating System | Terraform Module | Status | |---------------|------------------|------------------|--------| -| AWS | Flatcar Linux | [aws/container-linux/kubernetes](aws/container-linux/kubernetes) | stable | -| Azure | Flatcar Linux | [azure/container-linux/kubernetes](azure/container-linux/kubernetes) | alpha | -| Bare-Metal | Flatcar Linux | [bare-metal/container-linux/kubernetes](bare-metal/container-linux/kubernetes) | stable | -| DigitalOcean | Flatcar Linux | [digital-ocean/container-linux/kubernetes](digital-ocean/container-linux/kubernetes) | beta | -| Google Cloud | Flatcar Linux | [google-cloud/container-linux/kubernetes](google-cloud/container-linux/kubernetes) | beta | +| AWS | Flatcar Linux | [aws/flatcar-linux/kubernetes](aws/flatcar-linux/kubernetes) | stable | +| Azure | Flatcar Linux | [azure/flatcar-linux/kubernetes](azure/flatcar-linux/kubernetes) | alpha | +| Bare-Metal | Flatcar Linux | [bare-metal/flatcar-linux/kubernetes](bare-metal/flatcar-linux/kubernetes) | stable | +| DigitalOcean | Flatcar Linux | [digital-ocean/flatcar-linux/kubernetes](digital-ocean/flatcar-linux/kubernetes) | beta | +| Google Cloud | Flatcar Linux | [google-cloud/flatcar-linux/kubernetes](google-cloud/flatcar-linux/kubernetes) | beta | ## Documentation diff --git a/aws/fedora-coreos/kubernetes/README.md b/aws/fedora-coreos/kubernetes/README.md index ebbe486b..59c73a5e 100644 --- a/aws/fedora-coreos/kubernetes/README.md +++ b/aws/fedora-coreos/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/cl/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization +* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [spot](https://typhoon.psdn.io/cl/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/aws/container-linux/kubernetes/LICENSE b/aws/flatcar-linux/kubernetes/LICENSE similarity index 100% rename from aws/container-linux/kubernetes/LICENSE rename to aws/flatcar-linux/kubernetes/LICENSE diff --git a/aws/container-linux/kubernetes/README.md b/aws/flatcar-linux/kubernetes/README.md similarity index 97% rename from aws/container-linux/kubernetes/README.md rename to aws/flatcar-linux/kubernetes/README.md index 7804b8ea..e6036ef3 100644 --- a/aws/container-linux/kubernetes/README.md +++ b/aws/flatcar-linux/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/cl/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization +* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [spot](https://typhoon.psdn.io/cl/aws/#spot) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/aws/container-linux/kubernetes/ami.tf b/aws/flatcar-linux/kubernetes/ami.tf similarity index 100% rename from aws/container-linux/kubernetes/ami.tf rename to aws/flatcar-linux/kubernetes/ami.tf diff --git a/aws/container-linux/kubernetes/bootstrap.tf b/aws/flatcar-linux/kubernetes/bootstrap.tf similarity index 100% rename from aws/container-linux/kubernetes/bootstrap.tf rename to aws/flatcar-linux/kubernetes/bootstrap.tf diff --git a/aws/container-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml similarity index 100% rename from aws/container-linux/kubernetes/cl/controller.yaml rename to aws/flatcar-linux/kubernetes/cl/controller.yaml diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/flatcar-linux/kubernetes/controllers.tf similarity index 100% rename from aws/container-linux/kubernetes/controllers.tf rename to aws/flatcar-linux/kubernetes/controllers.tf diff --git a/aws/container-linux/kubernetes/network.tf b/aws/flatcar-linux/kubernetes/network.tf similarity index 100% rename from aws/container-linux/kubernetes/network.tf rename to aws/flatcar-linux/kubernetes/network.tf diff --git a/aws/container-linux/kubernetes/nlb.tf b/aws/flatcar-linux/kubernetes/nlb.tf similarity index 100% rename from aws/container-linux/kubernetes/nlb.tf rename to aws/flatcar-linux/kubernetes/nlb.tf diff --git a/aws/container-linux/kubernetes/outputs.tf b/aws/flatcar-linux/kubernetes/outputs.tf similarity index 100% rename from aws/container-linux/kubernetes/outputs.tf rename to aws/flatcar-linux/kubernetes/outputs.tf diff --git a/aws/container-linux/kubernetes/security.tf b/aws/flatcar-linux/kubernetes/security.tf similarity index 100% rename from aws/container-linux/kubernetes/security.tf rename to aws/flatcar-linux/kubernetes/security.tf diff --git a/aws/container-linux/kubernetes/ssh.tf b/aws/flatcar-linux/kubernetes/ssh.tf similarity index 100% rename from aws/container-linux/kubernetes/ssh.tf rename to aws/flatcar-linux/kubernetes/ssh.tf diff --git a/aws/container-linux/kubernetes/variables.tf b/aws/flatcar-linux/kubernetes/variables.tf similarity index 100% rename from aws/container-linux/kubernetes/variables.tf rename to aws/flatcar-linux/kubernetes/variables.tf diff --git a/aws/container-linux/kubernetes/versions.tf b/aws/flatcar-linux/kubernetes/versions.tf similarity index 100% rename from aws/container-linux/kubernetes/versions.tf rename to aws/flatcar-linux/kubernetes/versions.tf diff --git a/aws/container-linux/kubernetes/workers.tf b/aws/flatcar-linux/kubernetes/workers.tf similarity index 100% rename from aws/container-linux/kubernetes/workers.tf rename to aws/flatcar-linux/kubernetes/workers.tf diff --git a/aws/container-linux/kubernetes/workers/ami.tf b/aws/flatcar-linux/kubernetes/workers/ami.tf similarity index 100% rename from aws/container-linux/kubernetes/workers/ami.tf rename to aws/flatcar-linux/kubernetes/workers/ami.tf diff --git a/aws/container-linux/kubernetes/workers/cl/worker.yaml b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml similarity index 100% rename from aws/container-linux/kubernetes/workers/cl/worker.yaml rename to aws/flatcar-linux/kubernetes/workers/cl/worker.yaml diff --git a/aws/container-linux/kubernetes/workers/ingress.tf b/aws/flatcar-linux/kubernetes/workers/ingress.tf similarity index 100% rename from aws/container-linux/kubernetes/workers/ingress.tf rename to aws/flatcar-linux/kubernetes/workers/ingress.tf diff --git a/aws/container-linux/kubernetes/workers/outputs.tf b/aws/flatcar-linux/kubernetes/workers/outputs.tf similarity index 100% rename from aws/container-linux/kubernetes/workers/outputs.tf rename to aws/flatcar-linux/kubernetes/workers/outputs.tf diff --git a/aws/container-linux/kubernetes/workers/variables.tf b/aws/flatcar-linux/kubernetes/workers/variables.tf similarity index 100% rename from aws/container-linux/kubernetes/workers/variables.tf rename to aws/flatcar-linux/kubernetes/workers/variables.tf diff --git a/aws/container-linux/kubernetes/workers/versions.tf b/aws/flatcar-linux/kubernetes/workers/versions.tf similarity index 100% rename from aws/container-linux/kubernetes/workers/versions.tf rename to aws/flatcar-linux/kubernetes/workers/versions.tf diff --git a/aws/container-linux/kubernetes/workers/workers.tf b/aws/flatcar-linux/kubernetes/workers/workers.tf similarity index 100% rename from aws/container-linux/kubernetes/workers/workers.tf rename to aws/flatcar-linux/kubernetes/workers/workers.tf diff --git a/azure/fedora-coreos/kubernetes/README.md b/azure/fedora-coreos/kubernetes/README.md index 6da92200..fbc6238a 100644 --- a/azure/fedora-coreos/kubernetes/README.md +++ b/azure/fedora-coreos/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/) customization +* 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 * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/azure/container-linux/kubernetes/LICENSE b/azure/flatcar-linux/kubernetes/LICENSE similarity index 100% rename from azure/container-linux/kubernetes/LICENSE rename to azure/flatcar-linux/kubernetes/LICENSE diff --git a/azure/container-linux/kubernetes/README.md b/azure/flatcar-linux/kubernetes/README.md similarity index 96% rename from azure/container-linux/kubernetes/README.md rename to azure/flatcar-linux/kubernetes/README.md index 3644f70c..068e3f17 100644 --- a/azure/container-linux/kubernetes/README.md +++ b/azure/flatcar-linux/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/cl/azure/#low-priority) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization +* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [low-priority](https://typhoon.psdn.io/cl/azure/#low-priority) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/azure/container-linux/kubernetes/bootstrap.tf b/azure/flatcar-linux/kubernetes/bootstrap.tf similarity index 100% rename from azure/container-linux/kubernetes/bootstrap.tf rename to azure/flatcar-linux/kubernetes/bootstrap.tf diff --git a/azure/container-linux/kubernetes/cl/controller.yaml b/azure/flatcar-linux/kubernetes/cl/controller.yaml similarity index 100% rename from azure/container-linux/kubernetes/cl/controller.yaml rename to azure/flatcar-linux/kubernetes/cl/controller.yaml diff --git a/azure/container-linux/kubernetes/controllers.tf b/azure/flatcar-linux/kubernetes/controllers.tf similarity index 100% rename from azure/container-linux/kubernetes/controllers.tf rename to azure/flatcar-linux/kubernetes/controllers.tf diff --git a/azure/container-linux/kubernetes/lb.tf b/azure/flatcar-linux/kubernetes/lb.tf similarity index 100% rename from azure/container-linux/kubernetes/lb.tf rename to azure/flatcar-linux/kubernetes/lb.tf diff --git a/azure/container-linux/kubernetes/network.tf b/azure/flatcar-linux/kubernetes/network.tf similarity index 100% rename from azure/container-linux/kubernetes/network.tf rename to azure/flatcar-linux/kubernetes/network.tf diff --git a/azure/container-linux/kubernetes/outputs.tf b/azure/flatcar-linux/kubernetes/outputs.tf similarity index 100% rename from azure/container-linux/kubernetes/outputs.tf rename to azure/flatcar-linux/kubernetes/outputs.tf diff --git a/azure/container-linux/kubernetes/security.tf b/azure/flatcar-linux/kubernetes/security.tf similarity index 100% rename from azure/container-linux/kubernetes/security.tf rename to azure/flatcar-linux/kubernetes/security.tf diff --git a/azure/container-linux/kubernetes/ssh.tf b/azure/flatcar-linux/kubernetes/ssh.tf similarity index 100% rename from azure/container-linux/kubernetes/ssh.tf rename to azure/flatcar-linux/kubernetes/ssh.tf diff --git a/azure/container-linux/kubernetes/variables.tf b/azure/flatcar-linux/kubernetes/variables.tf similarity index 100% rename from azure/container-linux/kubernetes/variables.tf rename to azure/flatcar-linux/kubernetes/variables.tf diff --git a/azure/container-linux/kubernetes/versions.tf b/azure/flatcar-linux/kubernetes/versions.tf similarity index 100% rename from azure/container-linux/kubernetes/versions.tf rename to azure/flatcar-linux/kubernetes/versions.tf diff --git a/azure/container-linux/kubernetes/workers.tf b/azure/flatcar-linux/kubernetes/workers.tf similarity index 100% rename from azure/container-linux/kubernetes/workers.tf rename to azure/flatcar-linux/kubernetes/workers.tf diff --git a/azure/container-linux/kubernetes/workers/cl/worker.yaml b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml similarity index 100% rename from azure/container-linux/kubernetes/workers/cl/worker.yaml rename to azure/flatcar-linux/kubernetes/workers/cl/worker.yaml diff --git a/azure/container-linux/kubernetes/workers/variables.tf b/azure/flatcar-linux/kubernetes/workers/variables.tf similarity index 100% rename from azure/container-linux/kubernetes/workers/variables.tf rename to azure/flatcar-linux/kubernetes/workers/variables.tf diff --git a/azure/container-linux/kubernetes/workers/versions.tf b/azure/flatcar-linux/kubernetes/workers/versions.tf similarity index 100% rename from azure/container-linux/kubernetes/workers/versions.tf rename to azure/flatcar-linux/kubernetes/workers/versions.tf diff --git a/azure/container-linux/kubernetes/workers/workers.tf b/azure/flatcar-linux/kubernetes/workers/workers.tf similarity index 100% rename from azure/container-linux/kubernetes/workers/workers.tf rename to azure/flatcar-linux/kubernetes/workers/workers.tf diff --git a/bare-metal/fedora-coreos/kubernetes/README.md b/bare-metal/fedora-coreos/kubernetes/README.md index 9823c2d7..d7335fc1 100644 --- a/bare-metal/fedora-coreos/kubernetes/README.md +++ b/bare-metal/fedora-coreos/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/#container-linux) customization +* Advanced features like [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/bare-metal/container-linux/kubernetes/LICENSE b/bare-metal/flatcar-linux/kubernetes/LICENSE similarity index 100% rename from bare-metal/container-linux/kubernetes/LICENSE rename to bare-metal/flatcar-linux/kubernetes/LICENSE diff --git a/bare-metal/container-linux/kubernetes/README.md b/bare-metal/flatcar-linux/kubernetes/README.md similarity index 96% rename from bare-metal/container-linux/kubernetes/README.md rename to bare-metal/flatcar-linux/kubernetes/README.md index 8dd85b57..8608065b 100644 --- a/bare-metal/container-linux/kubernetes/README.md +++ b/bare-metal/flatcar-linux/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/#container-linux) customization +* Advanced features like [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/bare-metal/container-linux/kubernetes/bootstrap.tf b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/bootstrap.tf rename to bare-metal/flatcar-linux/kubernetes/bootstrap.tf diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml similarity index 100% rename from bare-metal/container-linux/kubernetes/cl/controller.yaml rename to bare-metal/flatcar-linux/kubernetes/cl/controller.yaml diff --git a/bare-metal/container-linux/kubernetes/cl/install.yaml b/bare-metal/flatcar-linux/kubernetes/cl/install.yaml similarity index 100% rename from bare-metal/container-linux/kubernetes/cl/install.yaml rename to bare-metal/flatcar-linux/kubernetes/cl/install.yaml diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml similarity index 100% rename from bare-metal/container-linux/kubernetes/cl/worker.yaml rename to bare-metal/flatcar-linux/kubernetes/cl/worker.yaml diff --git a/bare-metal/container-linux/kubernetes/groups.tf b/bare-metal/flatcar-linux/kubernetes/groups.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/groups.tf rename to bare-metal/flatcar-linux/kubernetes/groups.tf diff --git a/bare-metal/container-linux/kubernetes/outputs.tf b/bare-metal/flatcar-linux/kubernetes/outputs.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/outputs.tf rename to bare-metal/flatcar-linux/kubernetes/outputs.tf diff --git a/bare-metal/container-linux/kubernetes/profiles.tf b/bare-metal/flatcar-linux/kubernetes/profiles.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/profiles.tf rename to bare-metal/flatcar-linux/kubernetes/profiles.tf diff --git a/bare-metal/container-linux/kubernetes/ssh.tf b/bare-metal/flatcar-linux/kubernetes/ssh.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/ssh.tf rename to bare-metal/flatcar-linux/kubernetes/ssh.tf diff --git a/bare-metal/container-linux/kubernetes/variables.tf b/bare-metal/flatcar-linux/kubernetes/variables.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/variables.tf rename to bare-metal/flatcar-linux/kubernetes/variables.tf diff --git a/bare-metal/container-linux/kubernetes/versions.tf b/bare-metal/flatcar-linux/kubernetes/versions.tf similarity index 100% rename from bare-metal/container-linux/kubernetes/versions.tf rename to bare-metal/flatcar-linux/kubernetes/versions.tf diff --git a/digital-ocean/fedora-coreos/kubernetes/README.md b/digital-ocean/fedora-coreos/kubernetes/README.md index f511252f..145c3b7b 100644 --- a/digital-ocean/fedora-coreos/kubernetes/README.md +++ b/digital-ocean/fedora-coreos/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/) customization +* Advanced features like [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, and other [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/digital-ocean/container-linux/kubernetes/LICENSE b/digital-ocean/flatcar-linux/kubernetes/LICENSE similarity index 100% rename from digital-ocean/container-linux/kubernetes/LICENSE rename to digital-ocean/flatcar-linux/kubernetes/LICENSE diff --git a/digital-ocean/container-linux/kubernetes/README.md b/digital-ocean/flatcar-linux/kubernetes/README.md similarity index 96% rename from digital-ocean/container-linux/kubernetes/README.md rename to digital-ocean/flatcar-linux/kubernetes/README.md index a4b77090..248d881f 100644 --- a/digital-ocean/container-linux/kubernetes/README.md +++ b/digital-ocean/flatcar-linux/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/#container-linux) customization +* Advanced features like [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, and other [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/digital-ocean/container-linux/kubernetes/bootstrap.tf b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/bootstrap.tf rename to digital-ocean/flatcar-linux/kubernetes/bootstrap.tf diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml similarity index 100% rename from digital-ocean/container-linux/kubernetes/cl/controller.yaml rename to digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml similarity index 100% rename from digital-ocean/container-linux/kubernetes/cl/worker.yaml rename to digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/flatcar-linux/kubernetes/controllers.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/controllers.tf rename to digital-ocean/flatcar-linux/kubernetes/controllers.tf diff --git a/digital-ocean/container-linux/kubernetes/network.tf b/digital-ocean/flatcar-linux/kubernetes/network.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/network.tf rename to digital-ocean/flatcar-linux/kubernetes/network.tf diff --git a/digital-ocean/container-linux/kubernetes/outputs.tf b/digital-ocean/flatcar-linux/kubernetes/outputs.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/outputs.tf rename to digital-ocean/flatcar-linux/kubernetes/outputs.tf diff --git a/digital-ocean/container-linux/kubernetes/ssh.tf b/digital-ocean/flatcar-linux/kubernetes/ssh.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/ssh.tf rename to digital-ocean/flatcar-linux/kubernetes/ssh.tf diff --git a/digital-ocean/container-linux/kubernetes/variables.tf b/digital-ocean/flatcar-linux/kubernetes/variables.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/variables.tf rename to digital-ocean/flatcar-linux/kubernetes/variables.tf diff --git a/digital-ocean/container-linux/kubernetes/versions.tf b/digital-ocean/flatcar-linux/kubernetes/versions.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/versions.tf rename to digital-ocean/flatcar-linux/kubernetes/versions.tf diff --git a/digital-ocean/container-linux/kubernetes/workers.tf b/digital-ocean/flatcar-linux/kubernetes/workers.tf similarity index 100% rename from digital-ocean/container-linux/kubernetes/workers.tf rename to digital-ocean/flatcar-linux/kubernetes/workers.tf diff --git a/docs/advanced/customization.md b/docs/advanced/customization.md index 1104d8b3..4fd9f12f 100644 --- a/docs/advanced/customization.md +++ b/docs/advanced/customization.md @@ -167,7 +167,7 @@ Typhoon chooses variables to expose with purpose. If you must customize clusters ``` module "nemo" { - source = "git::https://github.com/USERNAME/typhoon//digital-ocean/container-linux/kubernetes?ref=myspecialcase" + source = "git::https://github.com/USERNAME/typhoon//digital-ocean/flatcar-linux/kubernetes?ref=myspecialcase" ... } ``` diff --git a/docs/advanced/worker-pools.md b/docs/advanced/worker-pools.md index 4f7084ac..fe6d5a4a 100644 --- a/docs/advanced/worker-pools.md +++ b/docs/advanced/worker-pools.md @@ -4,11 +4,11 @@ Typhoon AWS, Azure, and Google Cloud allow additional groups of workers to be de Internal Terraform Modules: -* `aws/container-linux/kubernetes/workers` +* `aws/flatcar-linux/kubernetes/workers` * `aws/fedora-coreos/kubernetes/workers` -* `azure/container-linux/kubernetes/workers` +* `azure/flatcar-linux/kubernetes/workers` * `azure/fedora-coreos/kubernetes/workers` -* `google-cloud/container-linux/kubernetes/workers` +* `google-cloud/flatcar-linux/kubernetes/workers` * `google-cloud/fedora-coreos/kubernetes/workers` ## AWS @@ -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/container-linux/kubernetes/workers?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//aws/flatcar-linux/kubernetes/workers?ref=v1.19.3" # AWS vpc_id = module.tempest.vpc_id @@ -71,7 +71,7 @@ Verify an auto-scaling group of workers joins the cluster within a few minutes. ### Variables -The AWS internal `workers` module supports a number of [variables](https://github.com/poseidon/typhoon/blob/master/aws/container-linux/kubernetes/workers/variables.tf). +The AWS internal `workers` module supports a number of [variables](https://github.com/poseidon/typhoon/blob/master/aws/flatcar-linux/kubernetes/workers/variables.tf). #### Required @@ -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/container-linux/kubernetes/workers?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//azure/flatcar-linux/kubernetes/workers?ref=v1.19.3" # Azure region = module.ramius.region @@ -168,7 +168,7 @@ Verify a scale set of workers joins the cluster within a few minutes. ### Variables -The Azure internal `workers` module supports a number of [variables](https://github.com/poseidon/typhoon/blob/master/azure/container-linux/kubernetes/workers/variables.tf). +The Azure internal `workers` module supports a number of [variables](https://github.com/poseidon/typhoon/blob/master/azure/flatcar-linux/kubernetes/workers/variables.tf). #### Required @@ -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/container-linux/kubernetes/workers?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes/workers?ref=v1.19.3" # Google Cloud region = "europe-west2" @@ -269,7 +269,7 @@ yavin-16x-worker-mzdm.c.example-com.internal Ready 3m v1.19.3 ### Variables -The Google Cloud internal `workers` module supports a number of [variables](https://github.com/poseidon/typhoon/blob/master/google-cloud/container-linux/kubernetes/workers/variables.tf). +The Google Cloud internal `workers` module supports a number of [variables](https://github.com/poseidon/typhoon/blob/master/google-cloud/flatcar-linux/kubernetes/workers/variables.tf). #### Required diff --git a/docs/architecture/concepts.md b/docs/architecture/concepts.md index dda1a600..ccec89b1 100644 --- a/docs/architecture/concepts.md +++ b/docs/architecture/concepts.md @@ -48,7 +48,7 @@ Clusters are declared in Terraform by referencing the module. ```tf module "yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes" + source = "git::https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes" cluster_name = "yavin" ... } @@ -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=hash" +source = "git:https://github.com/poseidon/typhoon//google-cloud/fedora-coreos/kubernetes?ref=hash" ``` 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/flatcar-linux/aws.md b/docs/flatcar-linux/aws.md index 2d4fd722..27582e62 100644 --- a/docs/flatcar-linux/aws.md +++ b/docs/flatcar-linux/aws.md @@ -68,11 +68,11 @@ Additional configuration options are described in the `aws` provider [docs](http ## Cluster -Define a Kubernetes cluster using the module `aws/container-linux/kubernetes`. +Define a Kubernetes cluster using the module `aws/flatcar-linux/kubernetes`. ```tf module "tempest" { - source = "git::https://github.com/poseidon/typhoon//aws/container-linux/kubernetes?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//aws/flatcar-linux/kubernetes?ref=v1.19.3" # AWS cluster_name = "tempest" @@ -88,7 +88,7 @@ module "tempest" { } ``` -Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/aws/container-linux/kubernetes/variables.tf) source. +Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/aws/flatcar-linux/kubernetes/variables.tf) source. ## ssh-agent @@ -174,7 +174,7 @@ Learn about [maintenance](/topics/maintenance/) and [addons](/addons/overview/). ## Variables -Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/aws/container-linux/kubernetes/variables.tf) source. +Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/aws/flatcar-linux/kubernetes/variables.tf) source. ### Required diff --git a/docs/flatcar-linux/azure.md b/docs/flatcar-linux/azure.md index 5b4b7de6..e42a0d5a 100644 --- a/docs/flatcar-linux/azure.md +++ b/docs/flatcar-linux/azure.md @@ -71,11 +71,11 @@ az vm image terms accept --publish kinvolk --offer flatcar-container-linux-free ## Cluster -Define a Kubernetes cluster using the module `azure/container-linux/kubernetes`. +Define a Kubernetes cluster using the module `azure/flatcar-linux/kubernetes`. ```tf module "ramius" { - source = "git::https://github.com/poseidon/typhoon//azure/container-linux/kubernetes?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//azure/flatcar-linux/kubernetes?ref=v1.19.3" # Azure cluster_name = "ramius" @@ -92,7 +92,7 @@ module "ramius" { } ``` -Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/azure/container-linux/kubernetes/variables.tf) source. +Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/azure/flatcar-linux/kubernetes/variables.tf) source. ## ssh-agent @@ -178,7 +178,7 @@ Learn about [maintenance](/topics/maintenance/) and [addons](/addons/overview/). ## Variables -Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/azure/container-linux/kubernetes/variables.tf) source. +Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/azure/flatcar-linux/kubernetes/variables.tf) source. ### Required diff --git a/docs/flatcar-linux/bare-metal.md b/docs/flatcar-linux/bare-metal.md index 6b9e723c..9f9acdd4 100644 --- a/docs/flatcar-linux/bare-metal.md +++ b/docs/flatcar-linux/bare-metal.md @@ -150,11 +150,11 @@ terraform { ## Cluster -Define a Kubernetes cluster using the module `bare-metal/container-linux/kubernetes`. +Define a Kubernetes cluster using the module `bare-metal/flatcar-linux/kubernetes`. ```tf module "mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes?ref=v1.19.3" # bare-metal cluster_name = "mercury" @@ -190,7 +190,7 @@ module "mercury" { } ``` -Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/bare-metal/container-linux/kubernetes/variables.tf) source. +Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/bare-metal/flatcar-linux/kubernetes/variables.tf) source. ## ssh-agent @@ -322,7 +322,7 @@ Learn about [maintenance](/topics/maintenance/) and [addons](/addons/overview/). ## Variables -Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/bare-metal/container-linux/kubernetes/variables.tf) source. +Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/bare-metal/flatcar-linux/kubernetes/variables.tf) source. ### Required diff --git a/docs/flatcar-linux/digitalocean.md b/docs/flatcar-linux/digitalocean.md index 3cfb6ab4..2422ba6e 100644 --- a/docs/flatcar-linux/digitalocean.md +++ b/docs/flatcar-linux/digitalocean.md @@ -77,11 +77,11 @@ Set the [os_image](#variables) in the next step. ## Cluster -Define a Kubernetes cluster using the module `digital-ocean/container-linux/kubernetes`. +Define a Kubernetes cluster using the module `digital-ocean/flatcar-linux/kubernetes`. ```tf module "nemo" { - source = "git::https://github.com/poseidon/typhoon//digital-ocean/container-linux/kubernetes?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//digital-ocean/flatcar-linux/kubernetes?ref=v1.19.3" # Digital Ocean cluster_name = "nemo" @@ -97,7 +97,7 @@ module "nemo" { } ``` -Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/digital-ocean/container-linux/kubernetes/variables.tf) source. +Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/digital-ocean/flatcar-linux/kubernetes/variables.tf) source. ## ssh-agent @@ -183,7 +183,7 @@ Learn about [maintenance](/topics/maintenance/) and [addons](/addons/overview/). ## Variables -Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/digital-ocean/container-linux/kubernetes/variables.tf) source. +Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/digital-ocean/flatcar-linux/kubernetes/variables.tf) source. ### Required diff --git a/docs/flatcar-linux/google-cloud.md b/docs/flatcar-linux/google-cloud.md index 776ef62a..b7b1c0ae 100644 --- a/docs/flatcar-linux/google-cloud.md +++ b/docs/flatcar-linux/google-cloud.md @@ -88,11 +88,11 @@ Set the [os_image](#variables) in the next step. ## Cluster -Define a Kubernetes cluster using the module `google-cloud/container-linux/kubernetes`. +Define a Kubernetes cluster using the module `google-cloud/flatcar-linux/kubernetes`. ```tf module "yavin" { - source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes?ref=v1.19.3" # Google Cloud cluster_name = "yavin" @@ -109,7 +109,7 @@ module "yavin" { } ``` -Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/google-cloud/container-linux/kubernetes/variables.tf) source. +Reference the [variables docs](#variables) or the [variables.tf](https://github.com/poseidon/typhoon/blob/master/google-cloud/flatcar-linux/kubernetes/variables.tf) source. ## ssh-agent @@ -196,7 +196,7 @@ Learn about [maintenance](/topics/maintenance/) and [addons](/addons/overview/). ## Variables -Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/google-cloud/container-linux/kubernetes/variables.tf) source. +Check the [variables.tf](https://github.com/poseidon/typhoon/blob/master/google-cloud/flatcar-linux/kubernetes/variables.tf) source. ### Required diff --git a/docs/index.md b/docs/index.md index 32f773ff..538cb2c8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/#container-linux) customization +* Advanced features like [worker pools](advanced/worker-pools/), [preemptible](fedora-coreos/google-cloud/#preemption) workers, and [snippets](advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, or other [addons](addons/overview/) ## Modules @@ -35,11 +35,11 @@ Typhoon is available for [Flatcar Linux](https://www.flatcar-linux.org/releases/ | Platform | Operating System | Terraform Module | Status | |---------------|------------------|------------------|--------| -| AWS | Flatcar Linux | [aws/container-linux/kubernetes](flatcar-linux/aws.md) | stable | -| Azure | Flatcar Linux | [azure/container-linux/kubernetes](flatcar-linux/azure.md) | alpha | -| Bare-Metal | Flatcar Linux | [bare-metal/container-linux/kubernetes](flatcar-linux/bare-metal.md) | stable | -| DigitalOcean | Flatcar Linux | [digital-ocean/container-linux/kubernetes](flatcar-linux/digitalocean.md) | beta | -| Google Cloud | Flatcar Linux | [google-cloud/container-linux/kubernetes](flatcar-linux/google-cloud.md) | beta | +| AWS | Flatcar Linux | [aws/flatcar-linux/kubernetes](flatcar-linux/aws.md) | stable | +| Azure | Flatcar Linux | [azure/flatcar-linux/kubernetes](flatcar-linux/azure.md) | alpha | +| Bare-Metal | Flatcar Linux | [bare-metal/flatcar-linux/kubernetes](flatcar-linux/bare-metal.md) | stable | +| DigitalOcean | Flatcar Linux | [digital-ocean/flatcar-linux/kubernetes](flatcar-linux/digitalocean.md) | beta | +| Google Cloud | Flatcar Linux | [google-cloud/flatcar-linux/kubernetes](flatcar-linux/google-cloud.md) | beta | ## Documentation diff --git a/docs/topics/maintenance.md b/docs/topics/maintenance.md index 75f766af..3febf5fb 100644 --- a/docs/topics/maintenance.md +++ b/docs/topics/maintenance.md @@ -18,7 +18,7 @@ module "yavin" { } module "mercury" { - source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes?ref=v1.19.3" + source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes?ref=v1.19.3" ... } ``` @@ -66,7 +66,7 @@ Delete or comment the Terraform config for the cluster. ``` - module "mercury" { -- source = "git::https://github.com/poseidon/typhoon//bare-metal/container-linux/kubernetes" +- source = "git::https://github.com/poseidon/typhoon//bare-metal/flatcar-linux/kubernetes" - ... -} ``` @@ -94,7 +94,7 @@ Once you're confident in the new cluster, delete the Terraform config for the ol ``` - module "yavin" { -- source = "git::https://github.com/poseidon/typhoon//google-cloud/container-linux/kubernetes" +- source = "git::https://github.com/poseidon/typhoon//google-cloud/flatcar-linux/kubernetes" - ... -} ``` diff --git a/google-cloud/fedora-coreos/kubernetes/README.md b/google-cloud/fedora-coreos/kubernetes/README.md index 49d4621b..cb660345 100644 --- a/google-cloud/fedora-coreos/kubernetes/README.md +++ b/google-cloud/fedora-coreos/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/) customization +* 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 * Ready for Ingress, Prometheus, Grafana, CSI, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/google-cloud/container-linux/kubernetes/LICENSE b/google-cloud/flatcar-linux/kubernetes/LICENSE similarity index 100% rename from google-cloud/container-linux/kubernetes/LICENSE rename to google-cloud/flatcar-linux/kubernetes/LICENSE diff --git a/google-cloud/container-linux/kubernetes/README.md b/google-cloud/flatcar-linux/kubernetes/README.md similarity index 95% rename from google-cloud/container-linux/kubernetes/README.md rename to google-cloud/flatcar-linux/kubernetes/README.md index 6540f6be..b7d8f196 100644 --- a/google-cloud/container-linux/kubernetes/README.md +++ b/google-cloud/flatcar-linux/kubernetes/README.md @@ -14,7 +14,7 @@ Typhoon distributes upstream Kubernetes, architectural conventions, and cluster * Kubernetes v1.19.3 (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/cl/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#container-linux) customization +* Advanced features like [worker pools](https://typhoon.psdn.io/advanced/worker-pools/), [preemptible](https://typhoon.psdn.io/cl/google-cloud/#preemption) workers, and [snippets](https://typhoon.psdn.io/advanced/customization/#hosts) customization * Ready for Ingress, Prometheus, Grafana, CSI, and other optional [addons](https://typhoon.psdn.io/addons/overview/) ## Docs diff --git a/google-cloud/container-linux/kubernetes/apiserver.tf b/google-cloud/flatcar-linux/kubernetes/apiserver.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/apiserver.tf rename to google-cloud/flatcar-linux/kubernetes/apiserver.tf diff --git a/google-cloud/container-linux/kubernetes/bootstrap.tf b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/bootstrap.tf rename to google-cloud/flatcar-linux/kubernetes/bootstrap.tf diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml similarity index 100% rename from google-cloud/container-linux/kubernetes/cl/controller.yaml rename to google-cloud/flatcar-linux/kubernetes/cl/controller.yaml diff --git a/google-cloud/container-linux/kubernetes/controllers.tf b/google-cloud/flatcar-linux/kubernetes/controllers.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/controllers.tf rename to google-cloud/flatcar-linux/kubernetes/controllers.tf diff --git a/google-cloud/container-linux/kubernetes/ingress.tf b/google-cloud/flatcar-linux/kubernetes/ingress.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/ingress.tf rename to google-cloud/flatcar-linux/kubernetes/ingress.tf diff --git a/google-cloud/container-linux/kubernetes/network.tf b/google-cloud/flatcar-linux/kubernetes/network.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/network.tf rename to google-cloud/flatcar-linux/kubernetes/network.tf diff --git a/google-cloud/container-linux/kubernetes/outputs.tf b/google-cloud/flatcar-linux/kubernetes/outputs.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/outputs.tf rename to google-cloud/flatcar-linux/kubernetes/outputs.tf diff --git a/google-cloud/container-linux/kubernetes/ssh.tf b/google-cloud/flatcar-linux/kubernetes/ssh.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/ssh.tf rename to google-cloud/flatcar-linux/kubernetes/ssh.tf diff --git a/google-cloud/container-linux/kubernetes/variables.tf b/google-cloud/flatcar-linux/kubernetes/variables.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/variables.tf rename to google-cloud/flatcar-linux/kubernetes/variables.tf diff --git a/google-cloud/container-linux/kubernetes/versions.tf b/google-cloud/flatcar-linux/kubernetes/versions.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/versions.tf rename to google-cloud/flatcar-linux/kubernetes/versions.tf diff --git a/google-cloud/container-linux/kubernetes/workers.tf b/google-cloud/flatcar-linux/kubernetes/workers.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/workers.tf rename to google-cloud/flatcar-linux/kubernetes/workers.tf diff --git a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml similarity index 100% rename from google-cloud/container-linux/kubernetes/workers/cl/worker.yaml rename to google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml diff --git a/google-cloud/container-linux/kubernetes/workers/outputs.tf b/google-cloud/flatcar-linux/kubernetes/workers/outputs.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/workers/outputs.tf rename to google-cloud/flatcar-linux/kubernetes/workers/outputs.tf diff --git a/google-cloud/container-linux/kubernetes/workers/target_pool.tf b/google-cloud/flatcar-linux/kubernetes/workers/target_pool.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/workers/target_pool.tf rename to google-cloud/flatcar-linux/kubernetes/workers/target_pool.tf diff --git a/google-cloud/container-linux/kubernetes/workers/variables.tf b/google-cloud/flatcar-linux/kubernetes/workers/variables.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/workers/variables.tf rename to google-cloud/flatcar-linux/kubernetes/workers/variables.tf diff --git a/google-cloud/container-linux/kubernetes/workers/versions.tf b/google-cloud/flatcar-linux/kubernetes/workers/versions.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/workers/versions.tf rename to google-cloud/flatcar-linux/kubernetes/workers/versions.tf diff --git a/google-cloud/container-linux/kubernetes/workers/workers.tf b/google-cloud/flatcar-linux/kubernetes/workers/workers.tf similarity index 100% rename from google-cloud/container-linux/kubernetes/workers/workers.tf rename to google-cloud/flatcar-linux/kubernetes/workers/workers.tf