diff --git a/.circleci/config.yml b/.circleci/config.yml index d30609be..31e70ee3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ jobs: - run: name: build docker images and push them to dockerhub command: | - helm_versions=( "v3.3.4" "v3.4.2" "v3.5.4" ) + helm_versions=( "v3.4.2" "v3.5.4" "v3.6.2" ) TAG=$(git describe --abbrev=0 --tags) docker login -u $DOCKER_USER -p $DOCKER_PASS diff --git a/.version b/.version index 18852632..22726832 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v3.7.1 +v3.7.2 diff --git a/Dockerfile b/Dockerfile index d7896630..ddb591e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG GO_VERSION="1.15.2" ARG ALPINE_VERSION="3.12" -ARG GLOBAL_KUBE_VERSION="v1.19.0" -ARG GLOBAL_HELM_VERSION="v3.5.4" +ARG GLOBAL_KUBE_VERSION="v1.19.8" +ARG GLOBAL_HELM_VERSION="v3.6.2" ARG GLOBAL_HELM_DIFF_VERSION="v3.1.3" ARG GLOBAL_SOPS_VERSION="v3.7.1" diff --git a/README.md b/README.md index 1ffcb7ea..68192e79 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=v3.7.1&x2=0)](https://github.com/Praqma/helmsman/releases) [![CircleCI](https://circleci.com/gh/Praqma/helmsman/tree/master.svg?style=svg)](https://circleci.com/gh/Praqma/helmsman/tree/master) +[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=v3.7.2&x2=0)](https://github.com/Praqma/helmsman/releases) [![CircleCI](https://circleci.com/gh/Praqma/helmsman/tree/master.svg?style=svg)](https://circleci.com/gh/Praqma/helmsman/tree/master) ![helmsman-logo](docs/images/helmsman.png) @@ -61,9 +61,9 @@ Check the [releases page](https://github.com/Praqma/Helmsman/releases) for the d ```sh # on Linux -curl -L https://github.com/Praqma/helmsman/releases/download/v3.7.1/helmsman_3.7.1_linux_amd64.tar.gz | tar zx +curl -L https://github.com/Praqma/helmsman/releases/download/v3.7.2/helmsman_3.7.2_linux_amd64.tar.gz | tar zx # on MacOS -curl -L https://github.com/Praqma/helmsman/releases/download/v3.7.1/helmsman_3.7.1_darwin_amd64.tar.gz | tar zx +curl -L https://github.com/Praqma/helmsman/releases/download/v3.7.2/helmsman_3.7.2_darwin_amd64.tar.gz | tar zx mv helmsman /usr/local/bin/helmsman ``` diff --git a/internal/app/main.go b/internal/app/main.go index 2643919e..43ddf7e6 100644 --- a/internal/app/main.go +++ b/internal/app/main.go @@ -8,7 +8,7 @@ import ( const ( helmBin = "helm" kubectlBin = "kubectl" - appVersion = "v3.7.1" + appVersion = "v3.7.2" tempFilesDir = ".helmsman-tmp" defaultContextName = "default" resourcePool = 10 diff --git a/release-notes.md b/release-notes.md index d8e590ae..7d37e0e4 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,5 @@ -# v3.7.1 +# v3.7.2 ## Fixes and improvements -- fixed an issue with checking chart versions (#613) -- hide tokens and passwords from the logs (#615) +- fixed an issue with yaml marshalling when merging multiple files