From d925bfb3d541671cf1d92a3c1bc21fa55ed822f5 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 9 Oct 2020 11:14:51 -0700
Subject: [PATCH] Actually update the default version of aws ebs to 0.7.0

---
 charts/kubezero-aws-ebs-csi-driver/.gitignore |  1 +
 .../charts/aws-ebs-csi-driver/.helmignore     | 22 -------------------
 .../charts/aws-ebs-csi-driver/values.yaml     |  2 +-
 charts/kubezero-aws-ebs-csi-driver/update.sh  | 10 +++++----
 4 files changed, 8 insertions(+), 27 deletions(-)
 create mode 100644 charts/kubezero-aws-ebs-csi-driver/.gitignore
 delete mode 100644 charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore

diff --git a/charts/kubezero-aws-ebs-csi-driver/.gitignore b/charts/kubezero-aws-ebs-csi-driver/.gitignore
new file mode 100644
index 0000000..5664e30
--- /dev/null
+++ b/charts/kubezero-aws-ebs-csi-driver/.gitignore
@@ -0,0 +1 @@
+git
diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore
deleted file mode 100644
index 50af031..0000000
--- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml
index fd74daf..8084d62 100644
--- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 2
 
 image:
   repository: amazon/aws-ebs-csi-driver
-  tag: "v0.6.0"
+  tag: "v0.7.0"
   pullPolicy: IfNotPresent
 
 sidecars:
diff --git a/charts/kubezero-aws-ebs-csi-driver/update.sh b/charts/kubezero-aws-ebs-csi-driver/update.sh
index afbf0d7..44c1520 100755
--- a/charts/kubezero-aws-ebs-csi-driver/update.sh
+++ b/charts/kubezero-aws-ebs-csi-driver/update.sh
@@ -4,9 +4,11 @@ set -ex
 # Upstream doesnt have proper Helm repo yet so we just download latest release and stuff it into charts
 
 REPO="kubernetes-sigs/aws-ebs-csi-driver"
-LATEST_RELEASE=$(curl -sL -s https://api.github.com/repos/${REPO}/releases | grep '"tag_name":' | cut -d'"' -f4 | grep -v -E "(alpha|beta|rc)" | sort -t"." -k 1,1 -k 2,2 -k 3,3 -k 4,4 | tail -n 1)
+[ -z "$RELEASE" ] && RELEASE=$(curl -sL -s https://api.github.com/repos/${REPO}/releases | grep '"tag_name":' | cut -d'"' -f4 | grep -v -E "(alpha|beta|rc)" | sort -t"." -k 1,1 -k 2,2 -k 3,3 -k 4,4 | tail -n 1)
 
-URL="https://github.com/${REPO}/releases/download/${LATEST_RELEASE}/helm-chart.tgz"
+rm -rf git
+git clone https://github.com/$REPO.git git
+cd git && git checkout $RELEASE && cd -
 
-rm -rf charts/aws-ebs-csi-driver
-curl -sL "$URL" | tar xz -C charts
+rm -rf charts/aws-ebs-csi-driver && mkdir -p charts/aws-ebs-csi-driver
+mv git/aws-ebs-csi-driver/* charts/aws-ebs-csi-driver