Merge "Deploy calico cni as a function in capo"

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:

manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml

@@ -20,5 +20,3 @@ spec:
       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

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: