Skip to content

Commit

Permalink
Add experimental Flatcar Linux arm64 support on AWS
Browse files Browse the repository at this point in the history
* Add `arch` variable to Flatcar Linux AWS `kubernetes` and
`workers` modules. Accept `amd64` (default) or `arm64` to support
native arm64/aarch64 clusters or mixed/hybrid clusters with arm64
workers
* Requires `flannel` or `cilium` CNI

Similar to #875
  • Loading branch information
dghubble committed Jan 14, 2022
1 parent f544a9c commit d0543ca
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 8 deletions.
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ Notable changes between versions.

* Switch Kubernetes Container Runtime from `docker` to `containerd` ([#1101](https://github.com/poseidon/typhoon/pull/1101))

### Flatcar Linux

#### AWS

* Add experimental Flatcar Linux ARM64 support
* Add `arch` variable to AWS `kubernetes` and `workers` modules
* Allow arm64 full-cluster or mixed/hybrid cluster with arm64 workers
* Requires `flannel` or `cilium` CNI provider

## v1.23.1

* Kubernetes [v1.23.1](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#v1231)
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ Typhoon is available for [Flatcar Linux](https://www.flatcar-linux.org/releases/
| 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 |

| Platform | Operating System | Terraform Module | Status |
|---------------|------------------|------------------|--------|
| AWS | Flatcar Linux (ARM64) | [aws/flatcar-linux/kubernetes](aws/flatcar-linux/kubernetes) | alpha |

## Documentation

* [Docs](https://typhoon.psdn.io)
Expand Down
24 changes: 23 additions & 1 deletion aws/flatcar-linux/kubernetes/ami.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
# Pick a Flatcar Linux AMI
# flatcar-stable -> Flatcar Linux AMI
ami_id = data.aws_ami.flatcar.image_id
ami_id = var.arch == "arm64" ? data.aws_ami.flatcar-arm64[0].image_id : data.aws_ami.flatcar.image_id
channel = split("-", var.os_image)[1]
}

Expand All @@ -25,3 +25,25 @@ data "aws_ami" "flatcar" {
}
}

data "aws_ami" "flatcar-arm64" {
count = var.arch == "arm64" ? 1 : 0

most_recent = true
owners = ["075585003325"]

filter {
name = "architecture"
values = ["arm64"]
}

filter {
name = "virtualization-type"
values = ["hvm"]
}

filter {
name = "name"
values = ["Flatcar-${local.channel}-*"]
}
}

11 changes: 11 additions & 0 deletions aws/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,17 @@ variable "cluster_domain_suffix" {
default = "cluster.local"
}

variable "arch" {
type = string
description = "Container architecture (amd64 or arm64)"
default = "amd64"

validation {
condition = var.arch == "amd64" || var.arch == "arm64"
error_message = "The arch must be amd64 or arm64."
}
}

variable "daemonset_tolerations" {
type = list(string)
description = "List of additional taint keys kube-system DaemonSets should tolerate (e.g. ['custom-role', 'gpu-role'])"
Expand Down
1 change: 1 addition & 0 deletions aws/flatcar-linux/kubernetes/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module "workers" {
worker_count = var.worker_count
instance_type = var.worker_type
os_image = var.os_image
arch = var.arch
disk_size = var.disk_size
spot_price = var.worker_price
target_groups = var.worker_target_groups
Expand Down
23 changes: 22 additions & 1 deletion aws/flatcar-linux/kubernetes/workers/ami.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
locals {
# Pick a Flatcar Linux AMI
# flatcar-stable -> Flatcar Linux AMI
ami_id = data.aws_ami.flatcar.image_id
ami_id = var.arch == "arm64" ? data.aws_ami.flatcar-arm64[0].image_id : data.aws_ami.flatcar.image_id
channel = split("-", var.os_image)[1]
}

Expand All @@ -25,3 +25,24 @@ data "aws_ami" "flatcar" {
}
}

data "aws_ami" "flatcar-arm64" {
count = var.arch == "arm64" ? 1 : 0

most_recent = true
owners = ["075585003325"]

filter {
name = "architecture"
values = ["arm64"]
}

filter {
name = "virtualization-type"
values = ["hvm"]
}

filter {
name = "name"
values = ["Flatcar-${local.channel}-*"]
}
}
13 changes: 13 additions & 0 deletions aws/flatcar-linux/kubernetes/workers/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,16 @@ variable "node_taints" {
description = "List of initial node taints"
default = []
}

# unofficial, undocumented, unsupported

variable "arch" {
type = string
description = "Container architecture (amd64 or arm64)"
default = "amd64"

validation {
condition = var.arch == "amd64" || var.arch == "arm64"
error_message = "The arch must be amd64 or arm64."
}
}
9 changes: 3 additions & 6 deletions docs/advanced/arm64.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# ARM64

!!! warning
ARM64 support is experimental

Typhoon has experimental support for ARM64 with Fedora CoreOS on AWS. Full clusters can be created with ARM64 controller and worker nodes. Or worker pools of ARM64 nodes can be attached to an AMD64 cluster to create a hybrid/mixed architecture cluster.
Typhoon has experimental support for ARM64 on AWS, with Fedora CoreOS or Flatcar Linux. Clusters can be created with ARM64 controller and worker nodes. Or worker pools of ARM64 nodes can be attached to an AMD64 cluster to create a hybrid/mixed architecture cluster.

!!! note
Currently, CNI networking must be set to flannel or Cilium.
Currently, CNI networking must be set to `flannel` or `cilium`.

## Cluster

Expand Down Expand Up @@ -35,7 +32,7 @@ module "gravitas" {
}
```

Verify the cluster has only arm64 (`aarch64`) nodes.
Verify the cluster has only arm64 (`aarch64`) nodes. For Flatcar Linux, describe nodes.

```
$ kubectl get nodes -o wide
Expand Down
4 changes: 4 additions & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ Typhoon is available for [Flatcar Linux](https://www.flatcar-linux.org/releases/
| 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 |

| Platform | Operating System | Terraform Module | Status |
|---------------|------------------|------------------|--------|
| AWS | Flatcar Linux (ARM64) | [aws/flatcar-linux/kubernetes](advanced/arm64.md) | alpha |

## Documentation

* Architecture [concepts](architecture/concepts.md) and [operating-systems](architecture/operating-systems.md)
Expand Down

0 comments on commit d0543ca

Please sign in to comment.