Skip to content

Commit

Permalink
Backport of Net 10114 consul is under resourced when deploying to crc…
Browse files Browse the repository at this point in the history
… local version of open shift into release/1.1.x (#4197)

* backport of commit 2fecfa9

* backport of commit 640a792

* backport of commit 8ef3b40

* backport of commit a083db0

* Net 10114 consul is under resourced when deploying to crc local version of open shift (#4184)

* cert managerkubectl get pods

* make resources for webhook cert manager configurable

* changelog entry

* Update charts/consul/values.yaml

* make gateway resources configurable

* update changelog

---------

Co-authored-by: Sarah Alsmiller <sarah.alsmiller@hashicorp.com>
Co-authored-by: sarahalsmiller <100602640+sarahalsmiller@users.noreply.github.com>
  • Loading branch information
3 people authored Jul 23, 2024
1 parent 198aafe commit 0e0b5ac
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .changelog/4184.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
* helm: Adds `webhookCertManager.resources` field which can be configured to override the `resource` settings for the `webhook-cert-manager` deployment.
```
9 changes: 3 additions & 6 deletions charts/consul/templates/webhook-cert-manager-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,10 @@ spec:
image: {{ .Values.global.imageK8S }}
name: webhook-cert-manager
{{- include "consul.restrictedSecurityContext" . | nindent 8 }}
{{- with .Values.webhookCertManager.resources }}
resources:
limits:
cpu: 100m
memory: 50Mi
requests:
cpu: 100m
memory: 50Mi
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
- name: config
mountPath: /bootstrap/config
Expand Down
27 changes: 27 additions & 0 deletions charts/consul/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3301,6 +3301,33 @@ webhookCertManager:
# @type: string
nodeSelector: null

# The resource requests (CPU, memory, etc.) for the server-acl-init and server-acl-init-cleanup pods.
# This should be a YAML map corresponding to a Kubernetes
# [`ResourceRequirements``](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core)
# object.
#
# Example:
#
# ```yaml
# resources:
# requests:
# memory: '200Mi'
# cpu: '100m'
# limits:
# memory: '200Mi'
# cpu: '100m'
# ```
#
# @recurse: false
# @type: map
resources:
requests:
memory: "50Mi"
cpu: "100m"
limits:
memory: "50Mi"
cpu: "100m"

# Configures a demo Prometheus installation.
prometheus:
# When true, the Helm chart will install a demo Prometheus server instance
Expand Down

0 comments on commit 0e0b5ac

Please sign in to comment.