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

Update resources for lifecycle sidecar and init container for connect-inject #291

Merged
merged 3 commits into from
Jul 9, 2020
Merged
Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion connect-inject/container_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
)

// The init container is bound in memory usage by the size of the consul binary
// as it issues a cpu of the binary to a shared volume. The limit is set to be
// slightly larger than the binary to ensure we don't get OOM killed during the cp.
const (
initContainerCPULimit = "50m"
initContainerCPURequest = "50m"
initContainerMemoryLimit = "25Mi"
initContainerMemoryLimit = "150Mi"
initContainerMemoryRequest = "25Mi"
)

Expand Down
4 changes: 2 additions & 2 deletions connect-inject/lifecycle_sidecar.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
)

const (
lifecycleContainerCPULimit = "10m"
lifecycleContainerCPURequest = "10m"
lifecycleContainerCPULimit = "20m"
lifecycleContainerCPURequest = "20m"
lifecycleContainerMemoryLimit = "25Mi"
lifecycleContainerMemoryRequest = "25Mi"
)
Expand Down