From bf22222f7dbf929f8650698df6e9b845906fab22 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 16 Apr 2020 23:49:55 -0700 Subject: [PATCH] Remove temporary workaround for v1.18.0 apply issue * In v1.18.0, kubectl apply would fail to apply manifests if any single manifest was unable to validate. For example, if a CRD and CR were defined in the same directory, apply would fail since the CR would be invalid as the CRD wouldn't exist * Typhoon temporary workaround was to separate CNI CRD manifests and explicitly apply them first. No longer needed in v1.18.1+ * Kubernetes v1.18.1 restored the prior behavior where kubectl apply applies as many valid manifests as it can. In the example above, the CRD would be applied and the CR could be applied if the kubectl apply was re-run (allowing for apply loops). * Upstream fix: https://github.com/kubernetes/kubernetes/pull/89864 --- aws/container-linux/kubernetes/cl/controller.yaml | 6 ------ aws/fedora-coreos/kubernetes/fcc/controller.yaml | 6 ------ azure/container-linux/kubernetes/cl/controller.yaml | 6 ------ bare-metal/container-linux/kubernetes/cl/controller.yaml | 6 ------ bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml | 6 ------ digital-ocean/container-linux/kubernetes/cl/controller.yaml | 6 ------ google-cloud/container-linux/kubernetes/cl/controller.yaml | 6 ------ google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml | 6 ------ 8 files changed, 48 deletions(-) diff --git a/aws/container-linux/kubernetes/cl/controller.yaml b/aws/container-linux/kubernetes/cl/controller.yaml index c9648120..c1a131c4 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml +++ b/aws/container-linux/kubernetes/cl/controller.yaml @@ -169,8 +169,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -184,10 +182,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 67a4ba4e..1bcb4b5f 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -154,8 +154,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -168,10 +166,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/azure/container-linux/kubernetes/cl/controller.yaml b/azure/container-linux/kubernetes/cl/controller.yaml index 9102a692..3e036c7e 100644 --- a/azure/container-linux/kubernetes/cl/controller.yaml +++ b/azure/container-linux/kubernetes/cl/controller.yaml @@ -167,8 +167,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -182,10 +180,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml b/bare-metal/container-linux/kubernetes/cl/controller.yaml index e6026b8e..ea9c2d9d 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml @@ -185,8 +185,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -200,10 +198,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index 0689e759..c16cc4af 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -165,8 +165,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -179,10 +177,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml b/digital-ocean/container-linux/kubernetes/cl/controller.yaml index 88f8d93f..0816ca90 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml @@ -176,8 +176,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -191,10 +189,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml b/google-cloud/container-linux/kubernetes/cl/controller.yaml index fa1ba8ea..a07c23bb 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml @@ -167,8 +167,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -182,10 +180,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5 diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index 8d51d374..33416d2c 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -155,8 +155,6 @@ storage: sudo mv static-manifests/* /etc/kubernetes/manifests/ 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,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 manifests-networking - path: /opt/bootstrap/apply @@ -169,10 +167,6 @@ storage: echo "Waiting for static pod control plane" sleep 5 done - until kubectl apply -f /assets/manifests/crds -R; do - echo "Retry Custom Resource Definition manifests" - sleep 5 - done until kubectl apply -f /assets/manifests -R; do echo "Retry applying manifests" sleep 5