diff --git a/.version b/.version index c2caabd0..f590c647 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v3.0.0-beta2 +v3.0.0-beta6 diff --git a/README.md b/README.md index ab24ea7c..4e8eb2ea 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.0.0-beta5&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.0.0-beta6&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 @@ If you use private helm repos, you will need either `helm-gcs` or `helm-s3` plug Check the [releases page](https://github.com/Praqma/Helmsman/releases) for the different versions. ``` # on Linux -curl -L https://github.com/Praqma/helmsman/releases/download/v3.0.0-beta5/helmsman_3.0.0-beta5_linux_amd64.tar.gz | tar zx +curl -L https://github.com/Praqma/helmsman/releases/download/v3.0.0-beta6/helmsman_3.0.0-beta6_linux_amd64.tar.gz | tar zx # on MacOS -curl -L https://github.com/Praqma/helmsman/releases/download/v3.0.0-beta5/helmsman_3.0.0-beta5_darwin_amd64.tar.gz | tar zx +curl -L https://github.com/Praqma/helmsman/releases/download/v3.0.0-beta6/helmsman_3.0.0-beta6_darwin_amd64.tar.gz | tar zx mv helmsman /usr/local/bin/helmsman ``` diff --git a/docs/desired_state_specification.md b/docs/desired_state_specification.md index d78088eb..1a7934bb 100644 --- a/docs/desired_state_specification.md +++ b/docs/desired_state_specification.md @@ -1,5 +1,5 @@ --- -version: v3.0.0-beta5 +version: v3.0.0-beta6 --- # Helmsman desired state specification @@ -121,11 +121,9 @@ kubeContext = "minikube" # password = "$K8S_PASSWORD" # clusterURI = "https://192.168.99.100:8443" ## clusterURI= "$K8S_URI" -# serviceAccount = "my-service-account" # storageBackend = "secret" # slackWebhook = $MY_SLACK_WEBHOOK # reverseDelete = false -# tilerless = true # eyamlEnabled = true # eyamlPrivateKeyPath = "../keys/custom-key.pem" # eyamlPublicKeyPath = "../keys/custom-key.pub" @@ -138,11 +136,9 @@ settings: #password: "$K8S_PASSWORD" #clusterURI: "https://192.168.99.100:8443" ##clusterURI: "$K8S_URI" - #serviceAccount: "my-service-account" #storageBackend: "secret" #slackWebhook: "$MY_SLACK_WEBHOOK" #reverseDelete: false - #tilerless: true # eyamlEnabled: true # eyamlPrivateKeyPath: ../keys/custom-key.pem # eyamlPublicKeyPath: ../keys/custom-key.pub @@ -295,7 +291,6 @@ appsTemplates: default: &template valuesFile: "" - purge: false test: true protected: false wait: true @@ -303,7 +298,6 @@ appsTemplates: custom: &template_custom valuesFile: "" - purge: true test: true protected: false wait: false @@ -380,7 +374,6 @@ Example: chart = "stable/jenkins" version = "0.9.0" valuesFile = "" - purge = false test = true protected = false wait = true @@ -407,7 +400,6 @@ apps: chart: "stable/jenkins" version: "0.9.0" valuesFile: "" - purge: false test: true protected: false wait: true diff --git a/examples/example.toml b/examples/example.toml index 2e7edea9..242e2fea 100644 --- a/examples/example.toml +++ b/examples/example.toml @@ -1,4 +1,4 @@ -# version: v3.0.0-beta5 +# version: v3.0.0-beta6 # context defines the context of this Desired State File. # It is used to allow Helmsman identify which releases are managed by which DSF. diff --git a/examples/example.yaml b/examples/example.yaml index a56948f6..9c42f4bf 100644 --- a/examples/example.yaml +++ b/examples/example.yaml @@ -1,4 +1,4 @@ -# version: v3.0.0-beta5 +# version: v3.0.0-beta6 # metadata -- add as many key/value pairs as you want metadata: org: "example.com/$ORG_PATH/" diff --git a/internal/app/main.go b/internal/app/main.go index 0c31a983..259d24a9 100644 --- a/internal/app/main.go +++ b/internal/app/main.go @@ -6,7 +6,7 @@ import ( const ( helmBin = "helm" - appVersion = "v3.0.0-beta5" + appVersion = "v3.0.0-beta6" tempFilesDir = ".helmsman-tmp" defaultContextName = "default" )