From fc4871674e96b4331eb1017a694e008c5769be8e Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 29 Oct 2021 00:48:00 -0700 Subject: [PATCH 1/7] cli: improve secure preset --- cli/cmd/install/presets.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index dc0f15c7e6..55ab266012 100644 --- a/cli/cmd/install/presets.go +++ b/cli/cmd/install/presets.go @@ -13,7 +13,6 @@ var presets = map[string]interface{}{ PresetSecure: convert(secure), } -// TODO: enable prometheus in demo installation var demo = ` global: name: consul @@ -40,15 +39,23 @@ prometheus: var secure = ` global: name: consul - acls: - manageSystemACLs: true + enabled: true + datacenter: dc1 + gossipEncryption: + autoGenerate: true + secretName: "consul-gossip-encryption-key" + secretKey: "key" tls: enabled: true -connectInject: - enabled: true + enableAutoEncrypt: true + acls: + manageSystemACLs: true server: replicas: 1 - bootstrapExpect: 1 +connectInject: + enabled: true +controller: + enabled: true ` var globalNameConsul = ` From febb5c6098efcade965acf4f684d5450f3c32304 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 29 Oct 2021 00:51:08 -0700 Subject: [PATCH 2/7] remove bootstrapExpect since it defaults to replicas --- cli/cmd/install/presets.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index 55ab266012..6a9ffecbd4 100644 --- a/cli/cmd/install/presets.go +++ b/cli/cmd/install/presets.go @@ -27,7 +27,6 @@ connectInject: enableGatewayMetrics: true server: replicas: 1 - bootstrapExpect: 1 ui: enabled: true service: From 533aca05b480aeecccb9f7254210a68ff0ff76ef Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 29 Oct 2021 10:06:05 -0700 Subject: [PATCH 3/7] Update cli/cmd/install/presets.go Co-authored-by: Iryna Shustava --- cli/cmd/install/presets.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index 6a9ffecbd4..8d7b3164f7 100644 --- a/cli/cmd/install/presets.go +++ b/cli/cmd/install/presets.go @@ -42,8 +42,6 @@ global: datacenter: dc1 gossipEncryption: autoGenerate: true - secretName: "consul-gossip-encryption-key" - secretKey: "key" tls: enabled: true enableAutoEncrypt: true From b1d85cba9302c47477212627cd84d05140d61fc7 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 29 Oct 2021 10:06:11 -0700 Subject: [PATCH 4/7] Update cli/cmd/install/presets.go Co-authored-by: Iryna Shustava --- cli/cmd/install/presets.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index 8d7b3164f7..12bc4eab60 100644 --- a/cli/cmd/install/presets.go +++ b/cli/cmd/install/presets.go @@ -39,7 +39,6 @@ var secure = ` global: name: consul enabled: true - datacenter: dc1 gossipEncryption: autoGenerate: true tls: From f384acc1937eafad5c6090769fd5862cc47878c4 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 29 Oct 2021 10:06:16 -0700 Subject: [PATCH 5/7] Update cli/cmd/install/presets.go Co-authored-by: Iryna Shustava --- cli/cmd/install/presets.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index 12bc4eab60..7760d4a1d8 100644 --- a/cli/cmd/install/presets.go +++ b/cli/cmd/install/presets.go @@ -38,7 +38,6 @@ prometheus: var secure = ` global: name: consul - enabled: true gossipEncryption: autoGenerate: true tls: From bcd8724c6699be1e169562d68ca2f174983cfa4f Mon Sep 17 00:00:00 2001 From: David Yu Date: Mon, 1 Nov 2021 23:55:23 -0700 Subject: [PATCH 6/7] adding controller to demo preset --- cli/cmd/install/presets.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index 7760d4a1d8..f901d1e930 100644 --- a/cli/cmd/install/presets.go +++ b/cli/cmd/install/presets.go @@ -27,6 +27,8 @@ connectInject: enableGatewayMetrics: true server: replicas: 1 +controller: + enabled: true ui: enabled: true service: From d6253a3f74c53d2f2db17a550d35c256a823ad5a Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 2 Nov 2021 00:15:53 -0700 Subject: [PATCH 7/7] Changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e35d539ea..3e9bab3a40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ BREAKING CHANGES: * Helm Chart * The `kube-system` and `local-path-storage` namespaces are now _excluded_ from connect injection by default on Kubernetes versions >= 1.21. If you wish to enable injection on those namespaces, set `connectInject.namespaceSelector` to `null`. [[GH-726](https://github.com/hashicorp/consul-k8s/pull/726)] + IMPROVEMENTS: * Helm Chart * Automatic retry for `gossip-encryption-autogenerate-job` on failure [[GH-789](https://github.com/hashicorp/consul-k8s/pull/789)] @@ -10,7 +11,9 @@ IMPROVEMENTS: * CLI * Add `status` command. [[GH-768](https://github.com/hashicorp/consul-k8s/pull/768)] * Add `-verbose`, `-v` flag to the `consul-k8s install` command, which outputs all logs emitted from the installation. By default, verbose is set to `false` to hide logs that show resources are not ready. [[GH-810](https://github.com/hashicorp/consul-k8s/pull/810)] - * Add Prometheus deployment and Consul K8s metrics integration with demo preset when installing via `-preset=demo`. [[GH-809](https://github.com/hashicorp/consul-k8s/pull/809)] + * Set `prometheus.enabled` to true and enable all metrics for Consul K8s when installing via the `demo` preset. [[GH-809](https://github.com/hashicorp/consul-k8s/pull/809)] + * Set `controller.enabled` to `true` when installing via the `demo` preset. [[GH818](https://github.com/hashicorp/consul-k8s/pull/818)] + * Set `global.gossipEncryption.autoGenerate` to `true` and `global.tls.enableAutoEncrypt` to `true` when installing via the `secure` preset. [[GH818](https://github.com/hashicorp/consul-k8s/pull/818)] ## 0.35.0 (October 19, 2021)