Revert 273 tune kubeadmconfigspec files (#275)

* Revert "fix typo" This reverts commit 7db9aad. * Revert "enable audit_log in default" This reverts commit 2b3b1e6. * Revert "add elements one by one in the json array" This reverts commit e0ac422. * Revert "chore: tune kubeadmConfigSpec files" This reverts commit 88a17d1.
vexxhost · Dec 15, 2023 · 33c1656 · 33c1656
1 parent 7db9aad
commit 33c1656
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 30 deletions.
diff --git a/hack/run-functional-tests.sh b/hack/run-functional-tests.sh
@@ -64,8 +64,6 @@ openstack coe cluster create \
   --cluster-template k8s-${KUBE_TAG} \
   --master-count 1 \
   --node-count ${NODE_COUNT} \
-  --merge-labels \
-  --label audit_log_enabled=true \
   k8s-cluster
 
 # Wait for cluster creation to be queued

diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -1594,20 +1594,6 @@ def get_object(self) -> objects.ClusterClass:
                                                 "variable": "kubeletTLSCipherSuites",
                                             },
                                         },
-                                        {
-                                            "op": "add",
-                                            "path": "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/certSANs",  # noqa: E501
-                                            "valueFrom": {
-                                                "template": textwrap.dedent(
-                                                    """\
-                                                    - {{ .builtin.cluster.name }}
-                                                    - {{ .builtin.cluster.name }}.{{ .builtin.cluster.namespace }}
-                                                    - {{ .builtin.cluster.name }}.{{ .builtin.cluster.namespace }}.svc
-                                                    - {{ .builtin.cluster.name }}.{{ .builtin.cluster.namespace }}.svc.cluster.local # noqa: E501
-                                                    """
-                                                ),
-                                            },
-                                        },
                                         {
                                             "op": "add",
                                             "path": "/spec/template/spec/kubeadmConfigSpec/files/-",
@@ -1625,32 +1611,36 @@ def get_object(self) -> objects.ClusterClass:
                                         },
                                         {
                                             "op": "add",
-                                            "path": "/spec/template/spec/kubeadmConfigSpec/files/-",
+                                            "path": "/spec/template/spec/kubeadmConfigSpec/clusterConfiguration/apiServer/certSANs",  # noqa: E501
                                             "valueFrom": {
                                                 "template": textwrap.dedent(
                                                     """\
-                                                    path: "/etc/kubernetes/cloud.conf"
-                                                    owner: "root:root"
-                                                    permissions: "0600"
-                                                    content: "{{ .cloudControllerManagerConfig }}"
-                                                    encoding: "base64"
+                                                    - {{ .builtin.cluster.name }}
+                                                    - {{ .builtin.cluster.name }}.{{ .builtin.cluster.namespace }}
+                                                    - {{ .builtin.cluster.name }}.{{ .builtin.cluster.namespace }}.svc
+                                                    - {{ .builtin.cluster.name }}.{{ .builtin.cluster.namespace }}.svc.cluster.local # noqa: E501
                                                     """
-                                                )
+                                                ),
                                             },
                                         },
                                         {
                                             "op": "add",
-                                            "path": "/spec/template/spec/kubeadmConfigSpec/files/-",
+                                            "path": "/spec/template/spec/kubeadmConfigSpec/files",
                                             "valueFrom": {
                                                 "template": textwrap.dedent(
                                                     """\
-                                                    path: "/etc/kubernetes/cloud_ca.crt"
-                                                    owner: "root:root"
-                                                    permissions: "0600"
-                                                    content: "{{ .cloudCaCert }}"
-                                                    encoding: "base64"
+                                                    - path: "/etc/kubernetes/cloud.conf"
+                                                      owner: "root:root"
+                                                      permissions: "0600"
+                                                      content: "{{ .cloudControllerManagerConfig }}"
+                                                      encoding: "base64"
+                                                    - path: "/etc/kubernetes/cloud_ca.crt"
+                                                      owner: "root:root"
+                                                      permissions: "0600"
+                                                      content: "{{ .cloudCaCert }}"
+                                                      encoding: "base64"
                                                     """
-                                                )
+                                                ),
                                             },
                                         },
                                     ],