CHANGELOG.md

+## [4.0.1](https://gitlab.com/to-be-continuous/helm/compare/4.0.0...4.0.1) (2023-01-13)
+
+
+### Bug Fixes
+
+* **deploy:** deploy packaged chart instead of chart file (required for chart with dependencies) ([32356cc](https://gitlab.com/to-be-continuous/helm/commit/32356cc3877a6b8d3e7a46aab8610b4fb3ea41db))
+
 # [4.0.0](https://gitlab.com/to-be-continuous/helm/compare/3.3.2...4.0.0) (2023-01-11)
 
 

README.md

@@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `gi
 ```yaml
 include:
   - project: 'to-be-continuous/helm'
-    ref: '4.0.0'
+    ref: '4.0.1'
     file: '/templates/gitlab-ci-helm.yml'
 ```
 
@@ -456,11 +456,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/helm'
-    ref: '4.0.0'
+    ref: '4.0.1'
     file: '/templates/gitlab-ci-helm.yml'
   # Vault variant
   - project: 'to-be-continuous/helm'
-    ref: '4.0.0'
+    ref: '4.0.1'
     file: '/templates/gitlab-ci-helm-vault.yml'
 
 variables:

templates/gitlab-ci-helm-vault.yml

@@ -11,6 +11,6 @@ variables:
 .helm-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "helm", "4.0.0" ]
+      command: ["--service", "helm", "4.0.1" ]
     - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"

templates/gitlab-ci-helm.yml

@@ -455,16 +455,17 @@ stages:
       helm_opts="$helm_opts --namespace $namespace"
     fi
 
-    chart=${HELM_DEPLOY_CHART:-$HELM_CHART_DIR}
-    if [ -z "${chart}" ]; then
+    package=$(ls -1 ./helm_packages/*.tgz 2>/dev/null || echo "")
+    package=${package:-$HELM_DEPLOY_CHART}
+    if [ -z "${package}" ]; then
       log_error "No Chart to deploy! Please use \\e[32m\$HELM_DEPLOY_CHART\\e[0m to deploy a chart from a repository"
       log_error "Or check the provided variables to package your own chart!"
       exit 1
     fi
-    log_info "--- using \\e[32mchart\\e[0m: \\e[33;1m${chart}\\e[0m"
+    log_info "--- using \\e[32mpackage\\e[0m: \\e[33;1m${package}\\e[0m"
 
     # shellcheck disable=SC2086
-    helm $helm_opts $HELM_DEPLOY_ARGS $environment_name $chart
+    helm $helm_opts $HELM_DEPLOY_ARGS $environment_name $package
 
     # maybe execute post deploy script
     postscript="$HELM_SCRIPTS_DIR/helm-post-deploy.sh"
@@ -693,7 +694,7 @@ stages:
     entrypoint: [""]
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "helm", "4.0.0" ]
+      command: ["--service", "helm", "4.0.1" ]
   variables:
     HELM_CACHE_HOME: $CI_PROJECT_DIR/.cache/helm
     HELM_CONFIG_HOME: $CI_PROJECT_DIR/.config/helm