airship/airshipctl
Code Issues Proposed changes

Merge "Deploy calico cni as a function in capo"

Browse Source
This commit is contained in:
Zuul 2020-10-22 21:19:21 +00:00 committed by Gerrit Code Review
commit 0d036ba097
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/function/k8scontrol-capo/controlplane.yaml
View File

@ -57,8 +57,6 @@ spec:
cloud-config: /etc/kubernetes/cloud.conf cloud-config: /etc/kubernetes/cloud.conf
cloud-provider: openstack cloud-provider: openstack
name: '{{ local_hostname }}' name: '{{ local_hostname }}'
postKubeadmCommands:
- sudo kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.15/manifests/calico.yaml
ntp: ntp:
servers: [] servers: []
users: users:

2
manifests/site/openstack-test-site/target/controlplane/control_plane_config_patch.yaml
View File

@ -20,5 +20,3 @@ spec:
encoding: base64 encoding: base64
owner: root owner: root
permissions: "0600" permissions: "0600"
postKubeadmCommands:
- sudo kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.15/manifests/calico.yaml

1
manifests/site/openstack-test-site/target/workers/kustomization.yaml
View File

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