From 597bd4d1fbd63b3bf1432dddf9956f90f3db3428 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 10 May 2022 11:32:12 +0200 Subject: [PATCH] fix: Ensure patches are applied during kubeadm upgrade --- charts/kubeadm/templates/InitConfiguration.yaml | 1 + charts/kubeadm/templates/JoinConfiguration.yaml | 2 ++ releases/v1.22/kubezero.sh | 2 +- releases/v1.22/upgrade_cluster.sh | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/kubeadm/templates/InitConfiguration.yaml b/charts/kubeadm/templates/InitConfiguration.yaml index 2ef6ee00..f334d04b 100644 --- a/charts/kubeadm/templates/InitConfiguration.yaml +++ b/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 diff --git a/charts/kubeadm/templates/JoinConfiguration.yaml b/charts/kubeadm/templates/JoinConfiguration.yaml index 9fdbf1ff..41d30297 100644 --- a/charts/kubeadm/templates/JoinConfiguration.yaml +++ b/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 diff --git a/releases/v1.22/kubezero.sh b/releases/v1.22/kubezero.sh index 606e6080..4be8bc09 100755 --- a/releases/v1.22/kubezero.sh +++ b/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 diff --git a/releases/v1.22/upgrade_cluster.sh b/releases/v1.22/upgrade_cluster.sh index d07e4105..788f6727 100755 --- a/releases/v1.22/upgrade_cluster.sh +++ b/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