ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 25 Packages Projects Releases Wiki Activity

fix: Ensure patches are applied during kubeadm upgrade

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charts/kubeadm/templates/InitConfiguration.yaml
View File

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

2
charts/kubeadm/templates/JoinConfiguration.yaml
View File

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

2
releases/v1.22/kubezero.sh
View File

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

2
releases/v1.22/upgrade_cluster.sh
View File

@ -48,7 +48,7 @@ spec:
type: Directory type: Directory
EOF 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 kubectl delete ds kubezero-upgrade-${VERSION//.} -n kube-system