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

fix: various v1.31 upgrade flow fixes

Browse Source
This commit is contained in:
Stefan Reimer 2025-02-17 11:49:02 +00:00
parent 441e319fe2
commit 06ee2841f1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/hooks-1.31.sh
View File

@ -7,8 +7,8 @@ pre_control_plane_upgrade_cluster() {
kubectl label node $n 'node.kubernetes.io/kubezero.version=v1.30.6' || true kubectl label node $n 'node.kubernetes.io/kubezero.version=v1.30.6' || true
done done
# patch aws-iam-authentiator DS to NOT run pods on 1.31 controllers # patch aws-iam-authenticator DS to NOT run pods on 1.31 controllers
kubectl patch ds aws-iam-authentiator -p '{"spec": {"template": {"spec": {"nodeSelector": {"node.kubernetes.io/kubezero.version": "v1.30.6"}}}}}' || true kubectl patch ds aws-iam-authenticator -n kube-system -p '{"spec": {"template": {"spec": {"nodeSelector": {"node.kubernetes.io/kubezero.version": "v1.30.6"}}}}}' || true
} }
@ -22,12 +22,12 @@ post_control_plane_upgrade_cluster() {
pre_cluster_upgrade_final() { pre_cluster_upgrade_final() {
if [ "$PLATFORM" == "aws" ];then if [ "$PLATFORM" == "aws" ];then
# cleanup aws-iam-authentiator # cleanup aws-iam-authenticator
kubectl delete clusterrolebinding aws-iam-authentiator || true kubectl delete clusterrolebinding aws-iam-authenticator || true
kubectl delete clusterrole aws-iam-authentiator || true kubectl delete clusterrole aws-iam-authenticator || true
kubectl delete serviceaccount aws-iam-authentiator -n kube-system || true kubectl delete serviceaccount aws-iam-authenticator -n kube-system || true
kubectl delete cm aws-iam-authentiator -n kube-system || true kubectl delete cm aws-iam-authenticator -n kube-system || true
kubectl delete ds aws-iam-authentiator -n kube-system || true kubectl delete ds aws-iam-authenticator -n kube-system || true
kubectl delete IAMIdentityMapping kubezero-worker-nodes || true kubectl delete IAMIdentityMapping kubezero-worker-nodes || true
kubectl delete IAMIdentityMapping kubernetes-admin || true kubectl delete IAMIdentityMapping kubernetes-admin || true
kubectl delete crd iamidentitymappings.iamauthenticator.k8s.aws || true kubectl delete crd iamidentitymappings.iamauthenticator.k8s.aws || true

3
admin/kubezero.sh
View File

@ -97,6 +97,7 @@ pre_kubeadm() {
cp -r ${WORKDIR}/kubeadm/templates/apiserver ${HOSTFS}/etc/kubernetes cp -r ${WORKDIR}/kubeadm/templates/apiserver ${HOSTFS}/etc/kubernetes
# copy patches to host to make --rootfs of kubeadm work # copy patches to host to make --rootfs of kubeadm work
rm -f ${HOSTFS}/etc/kubernetes/patches/*
cp -r ${WORKDIR}/kubeadm/templates/patches ${HOSTFS}/etc/kubernetes cp -r ${WORKDIR}/kubeadm/templates/patches ${HOSTFS}/etc/kubernetes
} }
@ -132,7 +133,7 @@ control_plane_upgrade() {
kubectl get application kubezero -n argocd -o yaml | \ kubectl get application kubezero -n argocd -o yaml | \
yq ".spec.source.helm.valuesObject |= load(\"$WORKDIR/kubezero-values.yaml\") | .spec.source.targetRevision = strenv(kubezero_chart_version)" \ yq ".spec.source.helm.valuesObject |= load(\"$WORKDIR/kubezero-values.yaml\") | .spec.source.targetRevision = strenv(kubezero_chart_version)" \
> $WORKDIR/new-argocd-app.yaml > $WORKDIR/new-argocd-app.yaml
kubectl apply --server-side --force-conflicts -f $WORKDIR/new-argocd-app.yaml kubectl replace -f $WORKDIR/new-argocd-app.yaml
# finally remove annotation to allow argo to sync again # finally remove annotation to allow argo to sync again
kubectl patch app kubezero -n argocd --type json -p='[{"op": "remove", "path": "/metadata/annotations"}]' || true kubectl patch app kubezero -n argocd --type json -p='[{"op": "remove", "path": "/metadata/annotations"}]' || true