Skip to content

Commit

Permalink
Merge pull request hashicorp#434 from hashicorp/release-0-20-0
Browse files Browse the repository at this point in the history
Release 0.20.0
  • Loading branch information
ishustava authored Apr 25, 2020
2 parents fe6f4fa + 495b579 commit 2edbe56
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Unreleased

## 0.20.0 (Apr 24, 2020)

BREAKING CHANGES:

* External Servers [[GH-430](https://github.com/hashicorp/consul-helm/pull/430)]:
Expand Down Expand Up @@ -96,6 +98,10 @@ IMPROVEMENTS:

* Default to the latest version of consul-k8s: hashicorp/consul-k8s:0.14.0

BUG FIXES:

* `tls-init-cleanup` can run even if pre-install fails [[GH-419](https://github.com/hashicorp/consul-helm/pull/419)].

## 0.19.0 (Apr 7, 2020)

BREAKING CHANGES:
Expand Down
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: consul
version: 0.19.0
version: 0.20.0
description: Install and configure Consul on Kubernetes.
home: https://www.consul.io
sources:
Expand Down
4 changes: 2 additions & 2 deletions scripts/generate-helm-config-for-hcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ if grep -i "permission denied" <<< "$output"; then
echo "ACL system already bootstrapped."
echo -e "${RED}Please update 'global.acls.bootstrapToken' values in the generated Helm config to point to the Kubernetes secret containing the bootstrap token.${NOCOLOR}"
echo -e "${RED}You can create a secret like so:${NOCOLOR}"
echo -e "${RED}kubectl create secret generic ${kube_resource_prefix}-bootstrap-token \${NOCOLOR}"
echo -e "${RED} --from-literal="token=<your bootstrap secret>"${NOCOLOR}"
echo -e "${RED}kubectl create secret generic ${kube_resource_prefix}-bootstrap-token \ ${NOCOLOR}"
echo -e "${RED} --from-literal='token=<your bootstrap secret>'${NOCOLOR}"
elif grep -i "ACL support disabled" <<< "$output"; then
echo -e "${RED}ACLs not enabled on this cluster.${NOCOLOR}"
exit 1
Expand Down

0 comments on commit 2edbe56

Please sign in to comment.