workaround for jsonpath for slices

vexxhost · Jan 23, 2024 · 4215366 · 4215366
1 parent 8dd30f1
commit 4215366
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -582,7 +582,15 @@ def get_object(self) -> objects.KubeadmControlPlaneTemplate:
                                             "cloud-provider": "external",
                                             "profiling": "false",
                                         },
-                                        "extraVolumes": [],
+                                        "extraVolumes": [
+                                            # Note(oleks): Add this as default as a workaround of the json patch limitation # noqa: E501
+                                            # https://cluster-api.sigs.k8s.io/tasks/experimental-features/cluster-class/write-clusterclass#json-patches-tips--tricks
+                                            {
+                                                "name": "webhooks",
+                                                "hostPath": "/etc/kubernetes/webhooks",
+                                                "mountPath": "/etc/kubernetes/webhooks",
+                                            }
+                                        ],
                                     },
                                     "controllerManager": {
                                         "extraArgs": {
@@ -1641,19 +1649,6 @@ def get_object(self) -> objects.ClusterClass:
                                             "path": "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/extraArgs/authorization-mode",  # noqa: E501
                                             "value": "Node,RBAC,Webhook",
                                         },
-                                        {
-                                            "op": "add",
-                                            "path": "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/extraVolumes/-",  # noqa: E501
-                                            "valueFrom": {
-                                                "template": textwrap.dedent(
-                                                    """\
-                                                    name: webhooks
-                                                    hostPath: /etc/kubernetes/webhooks
-                                                    mountPath: /etc/kubernetes/webhooks
-                                                    """
-                                                ),
-                                            },
-                                        },
                                     ],
                                 }
                             ],