diff --git a/charts/kubezero-addons/Chart.yaml b/charts/kubezero-addons/Chart.yaml index 488bffb..0a605cb 100644 --- a/charts/kubezero-addons/Chart.yaml +++ b/charts/kubezero-addons/Chart.yaml @@ -39,11 +39,11 @@ dependencies: condition: sealed-secrets.enabled - name: aws-node-termination-handler version: 0.21.0 - # repository: https://aws.github.io/eks-charts + repository: https://aws.github.io/eks-charts condition: aws-node-termination-handler.enabled - name: aws-eks-asg-rolling-update-handler version: 1.3.0 - # repository: https://twin.github.io/helm-charts + repository: https://twin.github.io/helm-charts condition: aws-eks-asg-rolling-update-handler.enabled - name: falco version: 3.3.0 diff --git a/charts/kubezero-addons/ruh.patch b/charts/kubezero-addons/aws-eks-asg-rolling-update-handler.patch similarity index 100% rename from charts/kubezero-addons/ruh.patch rename to charts/kubezero-addons/aws-eks-asg-rolling-update-handler.patch diff --git a/charts/kubezero-addons/nth.patch b/charts/kubezero-addons/aws-node-termination-handler.patch similarity index 100% rename from charts/kubezero-addons/nth.patch rename to charts/kubezero-addons/aws-node-termination-handler.patch diff --git a/charts/kubezero-addons/update.sh b/charts/kubezero-addons/update.sh index 4b2cf20..229ac14 100755 --- a/charts/kubezero-addons/update.sh +++ b/charts/kubezero-addons/update.sh @@ -1,19 +1,7 @@ #!/bin/bash set -ex -helm repo update +. ../../scripts/lib-update.sh -NTH_VERSION=$(yq eval '.dependencies[] | select(.name=="aws-node-termination-handler") | .version' Chart.yaml) -RUH_VERSION=$(yq eval '.dependencies[] | select(.name=="aws-eks-asg-rolling-update-handler") | .version' Chart.yaml) - -rm -rf charts/aws-node-termination-handler -helm pull eks/aws-node-termination-handler --untar --untardir charts --version $NTH_VERSION - -# diff -tuNr charts/aws-node-termination-handler.orig charts/aws-node-termination-handler > nth.patch -patch -p0 -i nth.patch --no-backup-if-mismatch - -rm -rf charts/aws-eks-asg-rolling-update-handler -helm pull twin/aws-eks-asg-rolling-update-handler --untar --untardir charts --version $RUH_VERSION -patch -p0 -i ruh.patch --no-backup-if-mismatch - -helm dep update +patch_chart aws-node-termination-handler +patch_chart aws-eks-asg-rolling-update-handler