Prepare for release v2020.09.29 (#41)

ProductLine: Stash Release: v2020.09.29 Release-tracker: stashed/CHANGELOG#10 Signed-off-by: 1gtm <1gtm@appscode.com>
stashed · Sep 29, 2020 · c971630 · c971630
1 parent bacd576
commit c971630
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,14 +63,25 @@ jobs:
           kubectl create --validate=false -f https://github.com/stashed/apimachinery/raw/master/crds/stash.appscode.com_tasks.yaml
           kubectl wait --for=condition=NamesAccepted crds --all --timeout=5m
 
+      - name: Setup Helm 3
+        run: |
+          # Avoid v3.3.3 due to https://github.com/helm/helm/commit/520416adf0723321101235780f86245c3a714c3c
+          curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
+
       - name: Test Helm 3
         run: |
+          helm version || true
+          echo "install catalog"
           ./deploy/helm3.sh
+          echo "uninstall catalog"
           ./deploy/helm3.sh --uninstall
 
       - name: Test script installer
         run: |
+          helm version || true
+          echo "install catalog"
           ./deploy/script.sh
+          echo "uninstall catalog"
           ./deploy/script.sh --uninstall
 
       - name: Setup Helm 2
@@ -83,5 +94,8 @@ jobs:
 
       - name: Test Helm 2
         run: |
+          helm version || true
+          echo "install catalog"
           ./deploy/helm2.sh
+          echo "uninstall catalog"
           ./deploy/helm2.sh --uninstall
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Generated by render-gotpl. DO NOT EDIT.
 | Catalog                                                         | Usage                       | Available Versions                                                                                                                        |
 | --------------------------------------------------------------- | --------------------------- | ------------------------------------------------------------------------------------------------------ |
 | [stash-elasticsearch](https://github.com/stashed/elasticsearch) | Stash Elasticsearch plugin | `5.6.4-v2`, `6.2.4-v2`, `6.3.0-v2`, `6.4.0-v2`, `6.5.3-v2`, `6.8.0-v2`, `7.2.0-v2`, `7.3.2-v2` |
-| [stash-mongodb](https://github.com/stashed/mongodb) | Stash Mongodb plugin | `3.4.17-v2`, `3.4.22-v2`, `3.6.13-v2`, `3.6.8-v2`, `4.0.3-v2`, `4.0.5-v2`, `4.0.11-v2`, `4.1.13-v2`, `4.1.4-v2`, `4.1.7-v2`, `4.2.3-v2` |
+| [stash-mongodb](https://github.com/stashed/mongodb) | Stash Mongodb plugin | `3.4.17-v2`, `3.4.22-v2`, `3.6.8-v2`, `3.6.13-v2`, `4.0.3-v2`, `4.0.5-v2`, `4.0.11-v2`, `4.1.4-v2`, `4.1.7-v2`, `4.1.13-v2`, `4.2.3-v2` |
 | [stash-mysql](https://github.com/stashed/mysql) | Stash Mysql plugin | `5.7.25-v2`, `8.0.3-v2`, `8.0.14-v2` |
 | [stash-percona-xtradb](https://github.com/stashed/percona-xtradb) | Stash Percona Xtradb plugin | `5.7-v2` |
 | [stash-postgres](https://github.com/stashed/postgres) | Stash Postgres plugin | `9.6.19`, `10.14.0`, `11.9.0`, `12.4.0` |

diff --git a/catalog.json b/catalog.json
@@ -20,14 +20,14 @@
       "versions": [
         "3.4.17-v2",
         "3.4.22-v2",
-        "3.6.13-v2",
         "3.6.8-v2",
+        "3.6.13-v2",
         "4.0.3-v2",
         "4.0.5-v2",
         "4.0.11-v2",
-        "4.1.13-v2",
         "4.1.4-v2",
         "4.1.7-v2",
+        "4.1.13-v2",
         "4.2.3-v2"
       ]
     },

diff --git a/deploy/helm2.sh b/deploy/helm2.sh
@@ -41,14 +41,14 @@ ELASTICSEARCH_VERSIONS=(
 MONGODB_VERSIONS=(
     3.4.17-v2
     3.4.22-v2
-    3.6.13-v2
     3.6.8-v2
+    3.6.13-v2
     4.0.3-v2
     4.0.5-v2
     4.0.11-v2
-    4.1.13-v2
     4.1.4-v2
     4.1.7-v2
+    4.1.13-v2
     4.2.3-v2
 )
 
@@ -425,7 +425,7 @@ if [[ $XTRADB_RESTORE_ARGS != "" ]]; then
 fi
 
 # Ensure Helm binary
-ensure_helm "v2.16.1"
+ensure_helm "v2.16.12"
 $HELM init --client-only
 
 # Add AppsCode chart registry

diff --git a/deploy/helm3.sh b/deploy/helm3.sh
@@ -41,14 +41,14 @@ ELASTICSEARCH_VERSIONS=(
 MONGODB_VERSIONS=(
     3.4.17-v2
     3.4.22-v2
-    3.6.13-v2
     3.6.8-v2
+    3.6.13-v2
     4.0.3-v2
     4.0.5-v2
     4.0.11-v2
-    4.1.13-v2
     4.1.4-v2
     4.1.7-v2
+    4.1.13-v2
     4.2.3-v2
 )
 
@@ -425,7 +425,7 @@ if [[ $XTRADB_RESTORE_ARGS != "" ]]; then
 fi
 
 # Ensure Helm binary
-ensure_helm "v3.1.1"
+ensure_helm "v3.3.4"
 
 # Add AppsCode chart registry
 $HELM repo add "${APPSCODE_CHART_REGISTRY}" "${APPSCODE_CHART_REGISTRY_URL}"

diff --git a/deploy/script.sh b/deploy/script.sh
@@ -41,14 +41,14 @@ ELASTICSEARCH_VERSIONS=(
 MONGODB_VERSIONS=(
     3.4.17-v2
     3.4.22-v2
-    3.6.13-v2
     3.6.8-v2
+    3.6.13-v2
     4.0.3-v2
     4.0.5-v2
     4.0.11-v2
-    4.1.13-v2
     4.1.4-v2
     4.1.7-v2
+    4.1.13-v2
     4.2.3-v2
 )
 
@@ -429,7 +429,7 @@ TEMP_CHART_DIR="$(mktemp -dt appscode-XXXXXX)"
 TEMP_DIRS+=(${TEMP_CHART_DIR})
 
 # Ensure Helm binary
-ensure_helm "v3.1.1"
+ensure_helm "v3.3.4"
 
 # Add AppsCode chart registry
 $HELM repo add "${APPSCODE_CHART_REGISTRY}" "${APPSCODE_CHART_REGISTRY_URL}"

diff --git a/templates/helm2.tpl b/templates/helm2.tpl
@@ -1,5 +1,5 @@
 # Ensure Helm binary
-ensure_helm "v2.16.1"
+ensure_helm "v2.16.12"
 $HELM init --client-only
 
 # Add AppsCode chart registry

diff --git a/templates/helm3.tpl b/templates/helm3.tpl
@@ -1,5 +1,5 @@
 # Ensure Helm binary
-ensure_helm "v3.1.1"
+ensure_helm "v3.3.4"
 
 # Add AppsCode chart registry
 $HELM repo add "${APPSCODE_CHART_REGISTRY}" "${APPSCODE_CHART_REGISTRY_URL}"

diff --git a/templates/script.tpl b/templates/script.tpl
@@ -3,7 +3,7 @@ TEMP_CHART_DIR="$(mktemp -dt appscode-XXXXXX)"
 TEMP_DIRS+=(${TEMP_CHART_DIR})
 
 # Ensure Helm binary
-ensure_helm "v3.1.1"
+ensure_helm "v3.3.4"
 
 # Add AppsCode chart registry
 $HELM repo add "${APPSCODE_CHART_REGISTRY}" "${APPSCODE_CHART_REGISTRY_URL}"