Skip to content
This repository was archived by the owner on May 20, 2023. It is now read-only.

Commit

Permalink
Fix bootstrap regression when networking="flannel"
Browse files Browse the repository at this point in the history
* 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 poseidon/typhoon#675
  • Loading branch information
dghubble committed Apr 1, 2020
1 parent 6aba0e1 commit cbcf168
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cl/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cbcf168

Please sign in to comment.