Skip to content

Commit 4c40408

Browse files
qboileauqboileau
authored
[Gateway] Move resources definition to gateway value block (#168)
* Move resources definition to gateway value block * Avoid double resource duplicate definition
1 parent cad4d76 commit 4c40408

File tree

4 files changed

+29
-2
lines changed

4 files changed

+29
-2
lines changed

‎charts/gateway/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ This section contains configuration of the Conduktor Gateway.
7575
| `gateway.jmx.enable` | Enable JMX JVM options | `false` |
7676
| `gateway.jmx.port` | JMX port to expose by default JVM args | `9999` |
7777
| `gateway.jmx.jvmArgs` | Arguments to pass to the gateway container JVM | `-Dcom.sun.management.jmxremote.port={{ .Values.gateway.jmx.port }} -Dcom.sun.management.jmxremote.rmi.port={{ .Values.gateway.jmx.port }} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=127.0.0.1` |
78+
| `gateway.resources.limits.cpu` | CPU limit for the platform container | `2000m` |
79+
| `gateway.resources.limits.memory` | Memory limit for the container | `4Gi` |
80+
| `gateway.resources.requests.cpu` | CPU resource requests | `500m` |
81+
| `gateway.resources.requests.memory` | Memory resource requests | `500m` |
7882
| `gateway.startupProbeDelay` | Optional delay in second before startup probe should be running (default 10) | `""` |
7983
| `gateway.podLabels` | Specific labels to be added to Gateway pod by deployment | `{}` |
8084
| `gateway.podAnnotations` | Gateway pod annotations | `{}` |

‎charts/gateway/templates/NOTES.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,9 @@ Admin API :
3434
Admin API credentials :
3535
ADMIN_LOGIN="$(kubectl get secret {{ include "conduktor-gateway.secretName" . }} -n {{ .Release.Namespace }} -o jsonpath="{.data.GATEWAY_ADMIN_API_USER_0_USERNAME}" | base64 --decode)"
3636
ADMIN_PASSWORD="$(kubectl get secret {{ include "conduktor-gateway.secretName" . }} -n {{ .Release.Namespace }} -o jsonpath="{.data.GATEWAY_ADMIN_API_USER_0_PASSWORD}" | base64 --decode)"
37+
{{- end }}
38+
39+
{{ if .Values.resources -}}
40+
Depreciation Warning:
41+
- Root value "resources" is deprecated. We recommend using "gateway.resources" instead.
3742
{{- end }}

‎charts/gateway/templates/deployment.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,10 @@ spec:
108108
port: {{ .Values.gateway.admin.port }}
109109
scheme: {{ .Values.tls.enable | ternary "HTTPS" "HTTP" }}
110110
initialDelaySeconds: {{ .Values.gateway.startupProbeDelay | default 10 }}
111-
{{- with .Values.resources }}
112-
resources: {{- toYaml . | nindent 12 }}
111+
{{- if .Values.resources }}
112+
resources: {{- toYaml .Values.resources | nindent 12 }}
113+
{{- else }}
114+
resources: {{- toYaml .Values.gateway.resources | nindent 12 }}
113115
{{- end }}
114116
{{- with .Values.gateway.podSecurityContext }}
115117
securityContext: {{- toYaml . | nindent 12 }}

‎charts/gateway/values.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,22 @@ gateway:
127127
## @param gateway.jmx.jvmArgs Arguments to pass to the gateway container JVM
128128
jvmArgs: -Dcom.sun.management.jmxremote.port={{ .Values.gateway.jmx.port }} -Dcom.sun.management.jmxremote.rmi.port={{ .Values.gateway.jmx.port }} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=127.0.0.1
129129

130+
# Conduktor Gateway resource requests and limits
131+
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
132+
## Gateway system requirements: https://docs.conduktor.io/gateway/get-started/system-requirements/
133+
##
134+
resources:
135+
limits:
136+
## @param gateway.resources.limits.cpu CPU limit for the platform container
137+
cpu: 2000m
138+
## @param gateway.resources.limits.memory Memory limit for the container
139+
memory: 4Gi
140+
requests:
141+
## @param gateway.resources.requests.cpu CPU resource requests
142+
cpu: 500m
143+
## @param gateway.resources.requests.memory Memory resource requests
144+
memory: 500m
145+
130146
## @param gateway.startupProbeDelay [nullable] Optional delay in second before startup probe should be running (default 10)
131147
startupProbeDelay: ""
132148

0 commit comments

Comments
 (0)