Compare commits

..

1 Commits

Author SHA1 Message Date
68b26b6d4e chore(deps): update helm release renovate to v41 2025-06-24 03:02:22 +00:00
5 changed files with 29 additions and 59 deletions

View File

@ -14,8 +14,11 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
ARGOCD=$(argo_used) ARGOCD=$(argo_used)
echo "Checking that all pods in kube-system are running ..."
waitSystemPodsRunning
[ "$ARGOCD" == "true" ] && disable_argo
control_plane_phase1() {
admin_job "upgrade_control_plane, upgrade_kubezero" admin_job "upgrade_control_plane, upgrade_kubezero"
#echo "Adjust kubezero values as needed:" #echo "Adjust kubezero values as needed:"
@ -30,48 +33,26 @@ control_plane_phase1() {
echo "Checking that all pods in kube-system are running ..." echo "Checking that all pods in kube-system are running ..."
waitSystemPodsRunning waitSystemPodsRunning
}
control_plane_phase2() {
# Final control plane upgrades
admin_job "upgrade_control_plane"
}
cluster_modules() {
echo "Applying remaining KubeZero modules..." echo "Applying remaining KubeZero modules..."
admin_job "apply_policy, apply_addons, apply_storage, apply_operators, apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_telemetry, apply_argo" admin_job "apply_policy, apply_addons, apply_storage, apply_operators, apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_telemetry, apply_argo"
# Final step is to commit the new argocd kubezero app # Final step is to commit the new argocd kubezero app
kubectl get app kubezero -n argocd -o yaml | yq 'del(.status) | del(.metadata) | del(.operation) | .metadata.name="kubezero" | .metadata.namespace="argocd"' | yq 'sort_keys(..)' > $ARGO_APP kubectl get app kubezero -n argocd -o yaml | yq 'del(.status) | del(.metadata) | del(.operation) | .metadata.name="kubezero" | .metadata.namespace="argocd"' | yq 'sort_keys(..)' > $ARGO_APP
}
backup() {
# Trigger backup of upgraded cluster state # Trigger backup of upgraded cluster state
kubectl create job --from=cronjob/kubezero-backup kubezero-backup-$KUBE_VERSION -n kube-system kubectl create job --from=cronjob/kubezero-backup kubezero-backup-$KUBE_VERSION -n kube-system
while true; do while true; do
kubectl wait --for=condition=complete job/kubezero-backup-$KUBE_VERSION -n kube-system 2>/dev/null && kubectl delete job kubezero-backup-$KUBE_VERSION -n kube-system && break kubectl wait --for=condition=complete job/kubezero-backup-$KUBE_VERSION -n kube-system 2>/dev/null && kubectl delete job kubezero-backup-$KUBE_VERSION -n kube-system && break
sleep 1 sleep 1
done done
}
#####
echo "Checking that all pods in kube-system are running ..."
waitSystemPodsRunning
[ "$ARGOCD" == "true" ] && disable_argo
control_plane_phase1
cluster_modules
backup
echo "Once ALL nodes, incl. workers, ALL, are running on $KUBE_VERSION, <return> to continue" echo "Once ALL nodes, incl. workers, ALL, are running on $KUBE_VERSION, <return> to continue"
read -r read -r
control_plane_phase2 # Final control plane upgrades
admin_job "upgrade_control_plane"
echo "Please commit $ARGO_APP as the updated kubezero/application.yaml for your cluster." echo "Please commit $ARGO_APP as the updated kubezero/application.yaml for your cluster."
echo "Then head over to ArgoCD for this cluster and sync all KubeZero modules to apply remaining upgrades." echo "Then head over to ArgoCD for this cluster and sync all KubeZero modules to apply remaining upgrades."

View File

@ -6,10 +6,3 @@ spec:
requests: requests:
cpu: 200m cpu: 200m
memory: 1536Mi memory: 1536Mi
limits:
memory: 3Gi
env:
- name: GOMEMLIMIT
valueFrom:
resourceFieldRef:
resource: limits.memory

View File

@ -30,7 +30,7 @@ dependencies:
repository: https://aquasecurity.github.io/helm-charts/ repository: https://aquasecurity.github.io/helm-charts/
condition: trivy.enabled condition: trivy.enabled
- name: renovate - name: renovate
version: 41.7.1 version: 41.6.3
repository: https://docs.renovatebot.com/helm-charts repository: https://docs.renovatebot.com/helm-charts
condition: renovate.enabled condition: renovate.enabled
kubeVersion: ">= 1.25.0" kubeVersion: ">= 1.25.0"

View File

@ -208,8 +208,6 @@ aws-efs-csi-driver:
useHelmHooksForCSIDriver: false useHelmHooksForCSIDriver: false
# we use the old 1.7 atm
replicaCount: 1
# image: # image:
# tag: "v2.0.9" # tag: "v2.0.9"

View File

@ -62,8 +62,6 @@ aws-ebs-csi-driver:
aws-efs-csi-driver: aws-efs-csi-driver:
enabled: {{ default false (index .Values "storage" "aws-efs-csi-driver" "enabled")}} enabled: {{ default false (index .Values "storage" "aws-efs-csi-driver" "enabled")}}
# Temp for old 1.7 chart we use atm
replicaCount: {{ ternary 2 1 .Values.global.highAvailable }}
controller: controller:
replicaCount: {{ ternary 2 1 .Values.global.highAvailable }} replicaCount: {{ ternary 2 1 .Values.global.highAvailable }}
{{- if .Values.global.highAvailable }} {{- if .Values.global.highAvailable }}