Commit aedc3627 authored by harshit aggarwal's avatar harshit aggarwal
Browse files

Merge branch 'setup-memorylimit' into 'master'

Add memory limits

Closes #79

See merge request !114
parents 9b3af1ab 356c06b0
Pipeline #67572 failed with stages
in 27 minutes and 11 seconds
......@@ -29,4 +29,11 @@ config:
ttl:
seconds: #{ENTV2_REDIS_TTL_SECONDS}#
istioDnsHost: #{ISTIO_DNS_HOST}#
\ No newline at end of file
istioDnsHost: #{ISTIO_DNS_HOST}#
env: #{ENVIRONMENT_NAME}#
featureFlag:
resourceLimits:
enableEnvs:
- demo
......@@ -28,10 +28,10 @@ spec:
app: {{ .Chart.Name }}
aadpodidbinding: osdu-identity
spec:
{{- if .Values.global.isAutoscalingEnabled }}
{{- if .Values.global.isAutoscalingEnabled }}
nodeSelector:
nodepool: {{ .Values.global.nodepool }}
{{- end }}
{{- end }}
volumes:
- name: azure-keyvault
csi:
......@@ -45,6 +45,15 @@ spec:
imagePullPolicy: Always
ports:
- containerPort: 80
{{- if has .Values.env .Values.featureFlag.resourceLimits.enabledEnvs }}
resources:
requests:
cpu: "100m"
memory: "600Mi"
limits:
cpu: "1000m"
memory: "1300Mi"
{{- end }}
readinessProbe:
httpGet:
path: {{ .Values.server.servlet.contextPath }}/_ah/readiness_check
......
......@@ -36,4 +36,11 @@ config:
ttl:
seconds: 1
istioDnsHost: ""
\ No newline at end of file
istioDnsHost: ""
env: demo
featureFlag:
resourceLimits:
enabledEnvs:
- demo
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment