From 99609727265b3c6fc0a84defecf85bc247d09f6d Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 31 Mar 2020 18:21:59 -0700 Subject: [PATCH] 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 --- CHANGES.md | 2 ++ aws/container-linux/kubernetes/cl/controller.yaml | 4 ++-- aws/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- azure/container-linux/kubernetes/cl/controller.yaml | 4 ++-- bare-metal/container-linux/kubernetes/cl/controller.yaml | 4 ++-- bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- digital-ocean/container-linux/kubernetes/cl/controller.yaml | 4 ++-- google-cloud/container-linux/kubernetes/cl/controller.yaml | 4 ++-- google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1a9b0f3d..9fae1824 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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)) * 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 diff --git a/aws/container-linux/kubernetes/cl/controller.yaml b/aws/container-linux/kubernetes/cl/controller.yaml index 940ec021..68791791 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml +++ b/aws/container-linux/kubernetes/cl/controller.yaml @@ -170,9 +170,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 diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 4603e4f7..439c4301 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -155,9 +155,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 mode: 0544 contents: diff --git a/azure/container-linux/kubernetes/cl/controller.yaml b/azure/container-linux/kubernetes/cl/controller.yaml index f34c4630..91b37e61 100644 --- a/azure/container-linux/kubernetes/cl/controller.yaml +++ b/azure/container-linux/kubernetes/cl/controller.yaml @@ -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 diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml b/bare-metal/container-linux/kubernetes/cl/controller.yaml index e5c14f30..53264179 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml @@ -186,9 +186,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 diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index 4925d7b5..fe774161 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -166,9 +166,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 mode: 0544 contents: diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml b/digital-ocean/container-linux/kubernetes/cl/controller.yaml index 04bb8e7e..5419ab45 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml @@ -177,9 +177,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 diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml b/google-cloud/container-linux/kubernetes/cl/controller.yaml index 424b41ae..9f2c9f61 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml @@ -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 diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index 85a75abd..d254f9e1 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -156,9 +156,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 mode: 0544 contents: