CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-16 04:51:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bootstrap regression when networking="flannel"

Browse Source 
* Fix bootstrap error for missing `manifests-networking/crd*yaml`
when `networking = "flannel"`
* Cleanup manifest-networking directory left during bootstrap
* Regressed in v1.18.0 changes for Calico https://github.com/poseidon/typhoon/pull/675
This commit is contained in:
Dalton Hubble
2020-03-31 18:21:59 -07:00
parent bac5acb3bd
commit 9960972726
9 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
google-cloud/container-linux/kubernetes/cl/controller.yaml
View File

@ -168,9 +168,9 @@ storage:
sudo mkdir -p /opt/bootstrap/assets
sudo mv manifests /opt/bootstrap/assets/manifests
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
sudo mv manifests-networking/crd*.yaml /opt/bootstrap/assets/manifests/crds
sudo mv manifests-networking/{crd,cluster}*.yaml /opt/bootstrap/assets/manifests/crds 2>/dev/null || true
sudo mv manifests-networking/* /opt/bootstrap/assets/manifests/
rm -rf assets auth static-manifests tls
rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply
filesystem: root
mode: 0544