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
This commit is contained in:
Dalton Hubble 2020-04-16 23:49:55 -07:00
parent 671eacb86e
commit bf22222f7d
8 changed files with 0 additions and 48 deletions

View File

@ -169,8 +169,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -184,10 +182,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -154,8 +154,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -168,10 +166,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -167,8 +167,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -182,10 +180,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -185,8 +185,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -200,10 +198,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -165,8 +165,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -179,10 +177,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -176,8 +176,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -191,10 +189,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -167,8 +167,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -182,10 +180,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5

View File

@ -155,8 +155,6 @@ storage:
sudo mv static-manifests/* /etc/kubernetes/manifests/ sudo mv static-manifests/* /etc/kubernetes/manifests/
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 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 manifests-networking rm -rf assets auth static-manifests tls manifests-networking
- path: /opt/bootstrap/apply - path: /opt/bootstrap/apply
@ -169,10 +167,6 @@ storage:
echo "Waiting for static pod control plane" echo "Waiting for static pod control plane"
sleep 5 sleep 5
done 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 until kubectl apply -f /assets/manifests -R; do
echo "Retry applying manifests" echo "Retry applying manifests"
sleep 5 sleep 5