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

values.yaml - set default connect inject init cpu resource limits to null to increase service registration times #2008

Merged
merged 8 commits into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from 7 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
3 changes: 3 additions & 0 deletions .changelog/2008.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
helm: Set default `limits.cpu` resource setting to `null` for `consul-connect-inject-init` container to speed up registration times when onboarding services onto the mesh during the init container lifecycle.
```
5 changes: 1 addition & 4 deletions charts/consul/test/unit/connect-inject-deployment.bats
Original file line number Diff line number Diff line change
Expand Up @@ -986,10 +986,7 @@ load _helpers
local actual=$(echo "$cmd" |
yq 'any(contains("-init-container-memory-limit=150Mi"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(echo "$cmd" |
yq 'any(contains("-init-container-cpu-limit=50m"))' | tee /dev/stderr)
[ "${actual}" = "true" ]

}

@test "connectInject/Deployment: can set init container resources" {
Expand Down
26 changes: 21 additions & 5 deletions charts/consul/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2130,15 +2130,22 @@ connectInject:
# @type: string
annotations: null

# The resource settings for connect inject pods.
# @recurse: false
# The resource settings for connect inject pods. The defaults, are optimized for getting started worklows on developer deployments. The settings should be tweaked for production deployments.
# @type: map
resources:
requests:
# Recommended default: 500Mi
# @type: string
memory: "50Mi"
# Recommended default: 250m
# @type: string
cpu: "50m"
limits:
# Recommended default: 500Mi
# @type: string
memory: "50Mi"
# Recommended default: 250m
# @type: string
cpu: "50m"

# Sets the failurePolicy for the mutating webhook. By default this will cause pods not part of the consul installation to fail scheduling while the webhook
Expand Down Expand Up @@ -2320,17 +2327,26 @@ connectInject:
# @type: string
cpu: null

# The resource settings for the Connect injected init container.
# @recurse: false
# The resource settings for the Connect injected init container. If null, the resources
# won't be set for the initContainer. The defaults are optimized for developer instances of
# Kubernetes, however they should be tweaked with the recommended defaults as shown below to speed up service registration times.
# @type: map
initContainer:
resources:
requests:
# Recommended default: 150Mi
# @type: string
memory: "25Mi"
# Recommended default: 250m
# @type: string
cpu: "50m"
limits:
# Recommended default: 150Mi
# @type: string
memory: "150Mi"
cpu: "50m"
david-yu marked this conversation as resolved.
Show resolved Hide resolved
# Recommended default: 500m
# @type: string
cpu: null

# [Mesh Gateways](https://developer.hashicorp.com/consul/docs/connect/gateways/mesh-gateway) enable Consul Connect to work across Consul datacenters.
meshGateway:
Expand Down