From 22c43c708987ced5ebfedf2748b8eba4d5ec2eb4 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 25 Jul 2024 14:39:16 +0100 Subject: [PATCH] fix: various minor fixes --- admin/upgrade_cluster.sh | 6 +++--- charts/kubezero-addons/README.md | 4 ++-- charts/kubezero-ci/values.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index c48285e7..7bc56dd0 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -38,6 +38,9 @@ echo "Applying remaining KubeZero modules..." control_plane_upgrade "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(..) | .spec.source.helm.values |= (from_yaml | to_yaml)' > $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 @@ -45,9 +48,6 @@ while true; do sleep 1 done -# 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(..) | .spec.source.helm.values |= (from_yaml | to_yaml)' > $ARGO_APP - 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." diff --git a/charts/kubezero-addons/README.md b/charts/kubezero-addons/README.md index ca8ac44a..88ae687e 100644 --- a/charts/kubezero-addons/README.md +++ b/charts/kubezero-addons/README.md @@ -1,6 +1,6 @@ # kubezero-addons -![Version: 0.8.8](https://img.shields.io/badge/Version-0.8.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.28](https://img.shields.io/badge/AppVersion-v1.28-informational?style=flat-square) +![Version: 0.8.8](https://img.shields.io/badge/Version-0.8.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.29](https://img.shields.io/badge/AppVersion-v1.29-informational?style=flat-square) KubeZero umbrella chart for various optional cluster addons @@ -63,7 +63,7 @@ Device plugin for [AWS Neuron](https://aws.amazon.com/machine-learning/neuron/) | aws-eks-asg-rolling-update-handler.environmentVars[8].name | string | `"AWS_STS_REGIONAL_ENDPOINTS"` | | | aws-eks-asg-rolling-update-handler.environmentVars[8].value | string | `"regional"` | | | aws-eks-asg-rolling-update-handler.image.repository | string | `"twinproduction/aws-eks-asg-rolling-update-handler"` | | -| aws-eks-asg-rolling-update-handler.image.tag | string | `"v1.8.3"` | | +| aws-eks-asg-rolling-update-handler.image.tag | string | `"v1.8.4"` | | | aws-eks-asg-rolling-update-handler.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` | | | aws-eks-asg-rolling-update-handler.resources.limits.memory | string | `"128Mi"` | | | aws-eks-asg-rolling-update-handler.resources.requests.cpu | string | `"10m"` | | diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index bd7173d7..f673813b 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -183,7 +183,7 @@ jenkins: agent: image: repository: public.ecr.aws/zero-downtime/jenkins-podman - tag: v0.6.0 + tag: v0.6.1 #alwaysPullImage: true podRetention: "Default" showRawYaml: false