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) diff --git a/cli/cmd/install/presets.go b/cli/cmd/install/presets.go index dc0f15c7e6..f901d1e930 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 @@ -28,7 +27,8 @@ connectInject: enableGatewayMetrics: true server: replicas: 1 - bootstrapExpect: 1 +controller: + enabled: true ui: enabled: true service: @@ -40,15 +40,19 @@ prometheus: var secure = ` global: name: consul - acls: - manageSystemACLs: true + gossipEncryption: + autoGenerate: true tls: enabled: true -connectInject: - enabled: true + enableAutoEncrypt: true + acls: + manageSystemACLs: true server: replicas: 1 - bootstrapExpect: 1 +connectInject: + enabled: true +controller: + enabled: true ` var globalNameConsul = `