Revert "chore: tune kubeadmConfigSpec files"

This reverts commit 88a17d1.
vexxhost · Dec 15, 2023 · ad90864 · ad90864
1 parent f4a5b20
commit ad90864
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -1594,6 +1594,21 @@ def get_object(self) -> objects.ClusterClass:
                                                 "variable": "kubeletTLSCipherSuites",
                                             },
                                         },
+                                        {
+                                            "op": "add",
+                                            "path": "/spec/template/spec/kubeadmConfigSpec/files/-",
+                                            "valueFrom": {
+                                                "template": textwrap.dedent(
+                                                    """\
+                                                    path: "/etc/containerd/config.toml"
+                                                    owner: "root:root"
+                                                    permissions: "0644"
+                                                    content: "{{ .containerdConfig }}"
+                                                    encoding: "base64"
+                                                    """
+                                                )
+                                            },
+                                        },
                                         {
                                             "op": "add",
                                             "path": "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/certSANs",  # noqa: E501
@@ -1614,11 +1629,6 @@ def get_object(self) -> objects.ClusterClass:
                                             "valueFrom": {
                                                 "template": textwrap.dedent(
                                                     """\
-                                                    - path: "/etc/containerd/config.toml"
-                                                      owner: "root:root"
-                                                      permissions: "0644"
-                                                      content: "{{ .containerdConfig }}"
-                                                      encoding: "base64"
                                                     - path: "/etc/kubernetes/cloud.conf"
                                                       owner: "root:root"
                                                       permissions: "0600"