fix: Ensure patches are applied during kubeadm upgrade

charts/kubeadm/templates/InitConfiguration.yaml

@@ -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

charts/kubeadm/templates/JoinConfiguration.yaml

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

releases/v1.22/kubezero.sh

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

releases/v1.22/upgrade_cluster.sh

@@ -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