fix: Ensure patches are applied during kubeadm upgrade

This commit is contained in:
Stefan Reimer 2022-05-10 11:32:12 +02:00
parent 573bdd4b77
commit 597bd4d1fb
4 changed files with 5 additions and 2 deletions

View File

@ -6,6 +6,7 @@ localAPIEndpoint:
patches:
directory: /tmp/patches
nodeRegistration:
criSocket: "unix:///var/run/crio/crio.sock"
ignorePreflightErrors:
- DirAvailable--var-lib-etcd
- DirAvailable--etc-kubernetes-manifests

View File

@ -1,4 +1,6 @@
apiVersion: kubeadm.k8s.io/v1beta3
kind: JoinConfiguration
nodeRegistration:
criSocket: "unix:///var/run/crio/crio.sock"
patches:
directory: /tmp/patches

View File

@ -130,7 +130,7 @@ if [ "$1" == 'upgrade' ]; then
pre_kubeadm
# Upgrade
_kubeadm upgrade apply -y
_kubeadm upgrade apply -y --patches /tmp/patches
post_kubeadm

View File

@ -48,7 +48,7 @@ spec:
type: Directory
EOF
kubectl rollout status daemonset -n kube-system kubezero-upgrade-${VERSION//.} --timeout 300s
#kubectl rollout status daemonset -n kube-system kubezero-upgrade-${VERSION//.} --timeout 300s
kubectl delete ds kubezero-upgrade-${VERSION//.} -n kube-system