diff --git a/manifests/function/k8scontrol-capo/controlplane.yaml b/manifests/function/k8scontrol-capo/controlplane.yaml index c947d11c8..92e38aa0b 100644 --- a/manifests/function/k8scontrol-capo/controlplane.yaml +++ b/manifests/function/k8scontrol-capo/controlplane.yaml @@ -57,8 +57,6 @@ spec: cloud-config: /etc/kubernetes/cloud.conf cloud-provider: openstack name: '{{ local_hostname }}' - postKubeadmCommands: - - sudo kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.15/manifests/calico.yaml ntp: servers: [] users: diff --git a/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml b/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml index ec19aeadb..1940e121d 100644 --- a/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml +++ b/manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml @@ -19,6 +19,4 @@ spec: content: Cg== encoding: base64 owner: root - permissions: "0600" - postKubeadmCommands: - - sudo kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.15/manifests/calico.yaml \ No newline at end of file + permissions: "0600" \ No newline at end of file diff --git a/manifests/site/openstack-test-site/target/workers/kustomization.yaml b/manifests/site/openstack-test-site/target/workers/kustomization.yaml index a5eb70db8..2ee127ed8 100755 --- a/manifests/site/openstack-test-site/target/workers/kustomization.yaml +++ b/manifests/site/openstack-test-site/target/workers/kustomization.yaml @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - ../../../../composite/infra - ../../../../function/workers-capo patchesStrategicMerge: