chore(deps): update helm release renovate to v41

admin/upgrade_cluster.sh

@@ -14,64 +14,45 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 ARGOCD=$(argo_used)
 
-
-control_plane_phase1() {
-  admin_job "upgrade_control_plane, upgrade_kubezero"
-
-  #echo "Adjust kubezero values as needed:"
-  # shellcheck disable=SC2015
-  #[ "$ARGOCD" == "true" ] && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kubezero
-
-  #echo "<Return> to continue"
-  #read -r
-
-  # upgrade modules
-  admin_job "apply_kubezero, apply_network"
-
-  echo "Checking that all pods in kube-system are running ..."
-  waitSystemPodsRunning
-}
-
-control_plane_phase2() {
-  # Final control plane upgrades
-  admin_job "upgrade_control_plane"
-}
-
-cluster_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"
-
-  # 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
-}
-
-backup() {
-  # Trigger backup of upgraded cluster state
-  kubectl create job --from=cronjob/kubezero-backup kubezero-backup-$KUBE_VERSION -n kube-system
-  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
-    sleep 1
-  done
-}
-
-#####
-
 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"
 
-cluster_modules
+#echo "Adjust kubezero values as needed:"
+# shellcheck disable=SC2015
+#[ "$ARGOCD" == "true" ] && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kubezero
 
-backup
+#echo "<Return> to continue"
+#read -r
+
+# upgrade modules
+admin_job "apply_kubezero, apply_network"
+
+echo "Checking that all pods in kube-system are running ..."
+waitSystemPodsRunning
+
+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"
+
+# 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
+
+# Trigger backup of upgraded cluster state
+kubectl create job --from=cronjob/kubezero-backup kubezero-backup-$KUBE_VERSION -n kube-system
+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
+  sleep 1
+done
 
 echo "Once ALL nodes, incl. workers, ALL, are running on $KUBE_VERSION, <return> to continue"
 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 "Then head over to ArgoCD for this cluster and sync all KubeZero modules to apply remaining upgrades."

charts/kubeadm/templates/patches/kube-apiserver0.yaml

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

charts/kubezero-ci/Chart.yaml

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

charts/kubezero-storage/values.yaml

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

charts/kubezero/templates/storage.yaml

@@ -62,8 +62,6 @@ aws-ebs-csi-driver:
 
 aws-efs-csi-driver:
   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:
     replicaCount: {{ ternary 2 1 .Values.global.highAvailable }}
     {{- if .Values.global.highAvailable }}