diff --git a/helm/name-lookup/renci-dev-values-populated.yaml b/helm/name-lookup/renci-dev-values-populated.yaml index 9686e14d0..c3b54ef7e 100644 Binary files a/helm/name-lookup/renci-dev-values-populated.yaml and b/helm/name-lookup/renci-dev-values-populated.yaml differ diff --git a/helm/name-lookup/templates/solr-deployment.yaml b/helm/name-lookup/templates/solr-deployment.yaml index b7cccbd8d..d2f43b42c 100644 --- a/helm/name-lookup/templates/solr-deployment.yaml +++ b/helm/name-lookup/templates/solr-deployment.yaml @@ -80,9 +80,9 @@ spec: httpGet: port: {{ .Values.solr.port }} path: /solr/admin/cores?action=STATUS - periodSeconds: 120 + periodSeconds: 600 timeoutSeconds: 120 - terminationGracePeriodSeconds: 600 + terminationGracePeriodSeconds: 1200 {{- with .Values.solr.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/helm/name-lookup/values.yaml b/helm/name-lookup/values.yaml index 7433eac7a..a64fbb420 100644 --- a/helm/name-lookup/values.yaml +++ b/helm/name-lookup/values.yaml @@ -57,7 +57,7 @@ solr: # the memory to Solr helps with performance. # requests: - memory: "32Gi" + memory: "16Gi" cpu: 4000m limits: memory: "32Gi" diff --git a/helm/node-normalization-web-server/renci-dev-values-populated.yaml b/helm/node-normalization-web-server/renci-dev-values-populated.yaml index dc9018e21..637ab24df 100644 Binary files a/helm/node-normalization-web-server/renci-dev-values-populated.yaml and b/helm/node-normalization-web-server/renci-dev-values-populated.yaml differ diff --git a/helm/node-normalization-web-server/templates/web-server-deployment.yaml b/helm/node-normalization-web-server/templates/web-server-deployment.yaml index d94ae0dad..76a8512c3 100644 --- a/helm/node-normalization-web-server/templates/web-server-deployment.yaml +++ b/helm/node-normalization-web-server/templates/web-server-deployment.yaml @@ -76,7 +76,7 @@ spec: {{ if .Values.web.startupProbe.enabled }} startupProbe: httpGet: - path: /docs + path: /status port: {{ .Values.web.port }} {{ with .Values.web.startupProbe.config }} {{ . | toYaml | nindent 12 }} @@ -85,7 +85,7 @@ spec: {{ if .Values.web.readinessProbe.enabled }} readinessProbe: httpGet: - path: /docs + path: /status port: {{ .Values.web.port }} {{ with .Values.web.readinessProbe.config }} {{ . | toYaml | nindent 12 }} @@ -94,7 +94,7 @@ spec: {{ if .Values.web.livenessProbe.enabled }} livenessProbe: httpGet: - path: /docs + path: /status port: {{ .Values.web.port }} {{ with .Values.web.livenessProbe.config }} {{ . | toYaml | nindent 12 }} diff --git a/helm/node-normalization-web-server/values.yaml b/helm/node-normalization-web-server/values.yaml index 97ce8241c..ed1ec2958 100644 --- a/helm/node-normalization-web-server/values.yaml +++ b/helm/node-normalization-web-server/values.yaml @@ -49,8 +49,8 @@ web: startupProbe: enabled: true config: - periodSeconds: 1 - timeoutSeconds: 1 + periodSeconds: 10 + timeoutSeconds: 5 successThreshold: 1 # to be able to detect pod started asap pinged every second, but not cause restart failureThreshold: 1500 @@ -58,8 +58,8 @@ web: readinessProbe: enabled: true config: - periodSeconds: 1 - timeoutSeconds: 1 + periodSeconds: 10 + timeoutSeconds: 3 # to make sure that if a worker got booted # we need to be sure before we start routing to that pod. successThreshold: 1 @@ -68,10 +68,10 @@ web: livenessProbe: enabled: true config: - periodSeconds: 5 # five seconds + periodSeconds: 30 timeoutSeconds: 30 successThreshold: 1 - # if a pod fails twice on /docs we boot it. + # if a pod fails twice on /status we boot it. failureThreshold: 2 resources: