feat: Support Flatcar OS and custom NTP servers

CHANGELOG.md

@@ -2,12 +2,10 @@
 
 ## [0.2.0](https://github.com/vexxhost/magnum-cluster-api/compare/v0.1.2...v0.2.0) (2022-11-16)
 
-
 ### Bug Fixes
 
 * added flux + node labels ([5f04d4e](https://github.com/vexxhost/magnum-cluster-api/commit/5f04d4ed8b00ba0d45cc59edd678bdf72679b00b))
 
-
 ### Miscellaneous Chores
 
 * release 0.2.0 ([9c8fe82](https://github.com/vexxhost/magnum-cluster-api/commit/9c8fe8252e61b43019a0c45d31284467ec99af15))

hack/stack.sh

@@ -79,6 +79,7 @@ kubectl label node kind-control-plane openstack-control-plane=enabled
 
 # Initialize the `clusterctl` CLI
 export EXP_CLUSTER_RESOURCE_SET=true
+export EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION=true #Used by the kubeadm bootstrap provider
 export CLUSTER_TOPOLOGY=true
 clusterctl init \
    --core cluster-api:v1.3.0-rc.0 \

magnum_cluster_api/cmd/image_builder.py

@@ -27,7 +27,7 @@
     "--operating-system",
     show_default=True,
     default="ubuntu-2004",
-    type=click.Choice(["ubuntu-2004"]),
+    type=click.Choice(["ubuntu-2004", "flatcar"]),
     help="Operating system to build image for",
 )
 @click.option(

magnum_cluster_api/driver.py

@@ -279,3 +279,11 @@ def provides(self):
         return [
             {"server_type": "vm", "os": "ubuntu-focal", "coe": "kubernetes"},
         ]
+
+
+class FlatcarDriver(BaseDriver):
+    @property
+    def provides(self):
+        return [
+            {"server_type": "vm", "os": "flatcar", "coe": "kubernetes"},
+        ]

magnum_cluster_api/resources.py

@@ -419,6 +419,19 @@ def get_object(self) -> objects.KubeadmControlPlaneTemplate:
                     "template": {
                         "spec": {
                             "kubeadmConfigSpec": {
+                                "format": "ignition",
+                                "ignition": {
+                                    "containerLinuxConfig": {
+                                        "additionalConfig": "storage:\n  links:\n  - path: /etc/systemd/system/kubeadm.service.wants/containerd.service\n    target: /usr/lib/systemd/system/containerd.service\n"
+                                    },
+                                },
+                                # In Flatcar kubeadm configuration is in different directory because /run
+                                # can't be provisioned with ignition.
+                                "preKubeadmCommands": [
+                                    """
+                                    bash -c "sed -i 's/__REPLACE_NODE_NAME__/$(hostname -s)/g' /etc/kubeadm.yml"
+                                    """
+                                ],
                                 "clusterConfiguration": {
                                     "apiServer": {
                                         "extraArgs": {
@@ -449,15 +462,15 @@ def get_object(self) -> objects.KubeadmControlPlaneTemplate:
                                 ],
                                 "initConfiguration": {
                                     "nodeRegistration": {
-                                        "name": "{{ local_hostname }}",
+                                        "name": "__REPLACE_NODE_NAME__",
                                         "kubeletExtraArgs": {
                                             "cloud-provider": "external",
                                         },
                                     },
                                 },
                                 "joinConfiguration": {
                                     "nodeRegistration": {
-                                        "name": "{{ local_hostname }}",
+                                        "name": "__REPLACE_NODE_NAME__",
                                         "kubeletExtraArgs": {
                                             "cloud-provider": "external",
                                         },
@@ -485,17 +498,30 @@ def get_object(self) -> objects.KubeadmConfigTemplate:
                 "spec": {
                     "template": {
                         "spec": {
+                            "format": "ignition",
+                            "ignition": {
+                                "containerLinuxConfig": {
+                                    "additionalConfig": "storage:\n  links:\n  - path: /etc/systemd/system/kubeadm.service.wants/containerd.service\n    target: /usr/lib/systemd/system/containerd.service\n"
+                                },
+                            },
                             "files": [],
+                            # In Flatcar kubeadm configuration is in different directory because /run
+                            # can't be provisioned with ignition.
+                            "preKubeadmCommands": [
+                                """
+                                bash -c "sed -i 's/__REPLACE_NODE_NAME__/$(hostname -s)/g' /etc/kubeadm.yml"
+                                """
+                            ],
                             "joinConfiguration": {
                                 "nodeRegistration": {
-                                    "name": "{{ local_hostname }}",
+                                    "name": "__REPLACE_NODE_NAME__",
                                     "kubeletExtraArgs": {
                                         "cloud-provider": "external",
                                     },
                                 },
                             },
-                        }
-                    }
+                        },
+                    },
                 },
             },
         )

pyproject.toml

@@ -23,3 +23,4 @@ magnum-cluster-api-image-loader = "magnum_cluster_api.cmd.image_loader:main"
 
 [tool.poetry.plugins."magnum.drivers"]
 "k8s_cluster_api_ubuntu_focal" = "magnum_cluster_api.driver:UbuntuFocalDriver"
+"k8s_cluster_api_flatcar" = "magnum_cluster_api.driver:FlatcarDriver"