Fix bootstrap regression when networking="flannel"
* 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:
parent
bac5acb3bd
commit
9960972726
|
@ -6,6 +6,8 @@ Notable changes between versions.
|
||||||
|
|
||||||
* Change `kube-proxy` and `calico` or `flannel` to tolerate specific taints ([#682](https://github.com/poseidon/typhoon/pull/682))
|
* Change `kube-proxy` and `calico` or `flannel` to tolerate specific taints ([#682](https://github.com/poseidon/typhoon/pull/682))
|
||||||
* Tolerate master and not-ready taints, rather than tolerating all taints
|
* Tolerate master and not-ready taints, rather than tolerating all taints
|
||||||
|
* Fix bootstrap when `networking` mode `flannel` (non-default) is chosen
|
||||||
|
* Regressed in v1.18.0 changes for Calico ([#675](https://github.com/poseidon/typhoon/pull/675))
|
||||||
|
|
||||||
## v1.18.0
|
## v1.18.0
|
||||||
|
|
||||||
|
|
|
@ -170,9 +170,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
|
|
@ -155,9 +155,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
mode: 0544
|
mode: 0544
|
||||||
contents:
|
contents:
|
||||||
|
|
|
@ -168,9 +168,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
|
|
@ -186,9 +186,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
|
|
@ -166,9 +166,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
mode: 0544
|
mode: 0544
|
||||||
contents:
|
contents:
|
||||||
|
|
|
@ -177,9 +177,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
|
|
@ -168,9 +168,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
filesystem: root
|
filesystem: root
|
||||||
mode: 0544
|
mode: 0544
|
||||||
|
|
|
@ -156,9 +156,9 @@ storage:
|
||||||
sudo mkdir -p /opt/bootstrap/assets
|
sudo mkdir -p /opt/bootstrap/assets
|
||||||
sudo mv manifests /opt/bootstrap/assets/manifests
|
sudo mv manifests /opt/bootstrap/assets/manifests
|
||||||
sudo mkdir -p /opt/bootstrap/assets/manifests/crds
|
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/
|
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
|
- path: /opt/bootstrap/apply
|
||||||
mode: 0544
|
mode: 0544
|
||||||
contents:
|
contents:
|
||||||
|
|
Loading…
Reference in New Issue