Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of values.yaml - Fix helm docs for 1.0.x into release/1.0.x #1811

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions charts/consul/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ global:
secretName: null

connectInject:
# Configuration to the Vault Secret that Kubernetes will use on
# Configuration to the Vault Secret that Kubernetes uses on
# Kubernetes pod creation, deletion, and update, to get CA certificates
# used issued from vault to send webhooks to the ConnectInject.
caCert:
Expand All @@ -270,7 +270,7 @@ global:
# @type: string
secretName: null

# Configuration to the Vault Secret that Kubernetes will use on
# Configuration to the Vault Secret that Kubernetes uses on
# Kubernetes pod creation, deletion, and update, to get TLS certificates
# used issued from vault to send webhooks to the ConnectInject.
tlsCert:
Expand Down Expand Up @@ -325,7 +325,7 @@ global:
# If true, the Helm chart will enable TLS for Consul
# servers and clients and all consul-k8s-control-plane components, as well as generate certificate
# authority (optional) and server and client certificates.
# This setting is required for [Cluster Peering](/docs/connect/cluster-peering/k8s).
# This setting is required for [Cluster Peering](https://developer.hashicorp.com/consul/docs/connect/cluster-peering/k8s).
enabled: false

# If true, turns on the auto-encrypt feature on clients and servers.
Expand Down Expand Up @@ -857,9 +857,9 @@ server:
# This configures the PodDisruptionBudget (https://kubernetes.io/docs/tasks/run-application/configure-pdb/)
# for the server cluster.
disruptionBudget:
# This will enable/disable registering a PodDisruptionBudget for the server
# cluster. If this is enabled, it will only register the budget so long as
# the server cluster is enabled.
# Enables registering a PodDisruptionBudget for the server
# cluster. If enabled, it only registers the budget so long as
# the server cluster is enabled. To disable, set to `false`.
enabled: true

# The maximum number of unavailable pods. By default, this will be
Expand Down Expand Up @@ -1949,7 +1949,7 @@ connectInject:

# Configures consul-cni plugin for Consul Service mesh services
cni:
# If true, then all traffic redirection setup will use the consul-cni plugin.
# If true, then all traffic redirection setup uses the consul-cni plugin.
# Requires connectInject.enabled to also be true.
# @type: boolean
enabled: false
Expand Down Expand Up @@ -2343,11 +2343,11 @@ connectInject:
memory: "150Mi"
cpu: "50m"

# [Mesh Gateways](/docs/connect/gateways/mesh-gateway) enable Consul Connect to work across Consul datacenters.
# [Mesh Gateways](https://developer.hashicorp.com/consul/docs/connect/gateways/mesh-gateway) enable Consul Connect to work across Consul datacenters.
meshGateway:
# If [mesh gateways](/docs/connect/gateways/mesh-gateway) are enabled, a Deployment will be created that runs
# If [mesh gateways](https://developer.hashicorp.com/consul/docs/connect/gateways/mesh-gateway) are enabled, a Deployment will be created that runs
# gateways and Consul Connect will be configured to use gateways.
# This setting is required for [Cluster Peering](/docs/connect/cluster-peering/k8s).
# This setting is required for [Cluster Peering](https://developer.hashicorp.com/consul/docs/connect/cluster-peering/k8s).
# Requirements: consul 1.6.0+ if using `global.acls.manageSystemACLs``.
enabled: false

Expand Down Expand Up @@ -2896,9 +2896,9 @@ apiGateway:
# @type: string
nodeSelector: null

# This value defines the tolerations that will be assigned to a gateway pod.
# Toleration settings for gateway pods created with the managed gateway class.
# This should be a multi-line string matching the
# Tolerations (https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
# [Tolerations](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
#
# @type: string
tolerations: null
Expand Down