Deploy calico cni as a function in capo

Remove deploying calico as postkubeadm command
Added support to deploy calico cni as a function

Change-Id: I212c82eb46fcfa6834f8ec61b5496ecfa989e083
This commit is contained in:
Ratnopam Chakrabarti 2020-10-14 19:00:02 -04:00
parent 6d6d837060
commit c7d8a71698
3 changed files with 2 additions and 5 deletions

View File

@ -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:

View File

@ -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
permissions: "0600"

View File

@ -1,6 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../../../composite/infra
- ../../../../function/workers-capo
patchesStrategicMerge: