Skip to content
Snippets Groups Projects

Re-introduce readinessProbe for eoscredentials

Merged Alexandre Lossent requested to merge master-patch-8ea6 into master
All threads resolved!
2 files
+ 25
13
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -52,7 +52,7 @@ spec:
@@ -52,7 +52,7 @@ spec:
app: {{ .Release.Name | quote }}
app: {{ .Release.Name | quote }}
webeos.cern.ch/place-new-webeos-sites: {{ .Values.placeNewWebeosSites | quote }}
webeos.cern.ch/place-new-webeos-sites: {{ .Values.placeNewWebeosSites | quote }}
{{- if .Values.podLabels }}
{{- if .Values.podLabels }}
{{ .Values.podLabels | toYaml | nindent 8 }}
{{- .Values.podLabels | toYaml | nindent 8 }}
{{- end }}
{{- end }}
annotations:
annotations:
webeos.cern.ch/webeos-site-path-regex: {{ .Values.webeosSitePathRegex | quote }}
webeos.cern.ch/webeos-site-path-regex: {{ .Values.webeosSitePathRegex | quote }}
@@ -65,13 +65,13 @@ spec:
@@ -65,13 +65,13 @@ spec:
checksum/mailrc-config: {{ include (print $.Template.BasePath "/mailrc-configmap.yaml") . | sha256sum }}
checksum/mailrc-config: {{ include (print $.Template.BasePath "/mailrc-configmap.yaml") . | sha256sum }}
spec:
spec:
{{- if .Values.nodeSelector }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ .Values.nodeSelector | toYaml | nindent 8 }}
nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }}
{{- end }}
{{- if .Values.tolerations }}
{{- if .Values.tolerations }}
tolerations: {{ .Values.tolerations | toYaml | nindent 8 }}
tolerations: {{- .Values.tolerations | toYaml | nindent 8 }}
{{- end }}
{{- end }}
{{- if .Values.affinity }}
{{- if .Values.affinity }}
affinity: {{ .Values.affinity | toYaml | nindent 8 }}
affinity: {{- .Values.affinity | toYaml | nindent 8 }}
{{- end }}
{{- end }}
dnsPolicy: ClusterFirst
dnsPolicy: ClusterFirst
# This is required to make sure DNS resolution doesn't time out.
# This is required to make sure DNS resolution doesn't time out.
@@ -112,13 +112,13 @@ spec:
@@ -112,13 +112,13 @@ spec:
- name: RELOAD_TIMESTAMP_FILE
- name: RELOAD_TIMESTAMP_FILE
value: /etc/httpd/conf.d/vhost/httpd-config-loaded
value: /etc/httpd/conf.d/vhost/httpd-config-loaded
{{- if .Values.containers.httpd.livenessProbe }}
{{- if .Values.containers.httpd.livenessProbe }}
livenessProbe: {{ .Values.containers.httpd.livenessProbe | toYaml | nindent 12 }}
livenessProbe: {{- .Values.containers.httpd.livenessProbe | toYaml | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.containers.httpd.readinessProbe }}
{{- if .Values.containers.httpd.readinessProbe }}
readinessProbe: {{ .Values.containers.httpd.readinessProbe | toYaml | nindent 12 }}
readinessProbe: {{- .Values.containers.httpd.readinessProbe | toYaml | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.containers.httpd.resources }}
{{- if .Values.containers.httpd.resources }}
resources: {{ .Values.containers.httpd.resources | toYaml | nindent 12 }}
resources: {{- .Values.containers.httpd.resources | toYaml | nindent 12 }}
{{- end }}
{{- end }}
lifecycle:
lifecycle:
preStop:
preStop:
@@ -166,13 +166,13 @@ spec:
@@ -166,13 +166,13 @@ spec:
imagePullPolicy: Always
imagePullPolicy: Always
command: ["php-fpm"]
command: ["php-fpm"]
{{- if .Values.containers.phpFpm.livenessProbe }}
{{- if .Values.containers.phpFpm.livenessProbe }}
livenessProbe: {{ .Values.containers.phpFpm.livenessProbe | toYaml | nindent 12 }}
livenessProbe: {{- .Values.containers.phpFpm.livenessProbe | toYaml | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.containers.phpFpm.readinessProbe }}
{{- if .Values.containers.phpFpm.readinessProbe }}
readinessProbe: {{ .Values.containers.phpFpm.readinessProbe | toYaml | nindent 12 }}
readinessProbe: {{- .Values.containers.phpFpm.readinessProbe | toYaml | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.containers.phpFpm.resources }}
{{- if .Values.containers.phpFpm.resources }}
resources: {{ .Values.containers.phpFpm.resources | toYaml | nindent 12 }}
resources: {{- .Values.containers.phpFpm.resources | toYaml | nindent 12 }}
{{- end }}
{{- end }}
terminationMessagePath: /dev/termination-log
terminationMessagePath: /dev/termination-log
volumeMounts:
volumeMounts:
@@ -202,10 +202,13 @@ spec:
@@ -202,10 +202,13 @@ spec:
image: {{ .Values.containers.eoscredentials.image | quote }}
image: {{ .Values.containers.eoscredentials.image | quote }}
imagePullPolicy: Always
imagePullPolicy: Always
{{- if .Values.containers.eoscredentials.livenessProbe }}
{{- if .Values.containers.eoscredentials.livenessProbe }}
livenessProbe: {{ .Values.containers.eoscredentials.livenessProbe | toYaml | nindent 12 }}
livenessProbe: {{- .Values.containers.eoscredentials.livenessProbe | toYaml | nindent 12 }}
 
{{- end }}
 
{{- if .Values.containers.eoscredentials.readinessProbe }}
 
readinessProbe: {{- .Values.containers.eoscredentials.readinessProbe | toYaml | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.containers.eoscredentials.resources }}
{{- if .Values.containers.eoscredentials.resources }}
resources: {{ .Values.containers.eoscredentials.resources | toYaml | nindent 12 }}
resources: {{- .Values.containers.eoscredentials.resources | toYaml | nindent 12 }}
{{- end }}
{{- end }}
env:
env:
- name: KEYTAB_USER
- name: KEYTAB_USER
@@ -268,7 +271,7 @@ spec:
@@ -268,7 +271,7 @@ spec:
timeoutSeconds: 5
timeoutSeconds: 5
periodSeconds: 10
periodSeconds: 10
successThreshold: 1
successThreshold: 1
resources: {{ .Values.containers.controller.resources | toYaml | nindent 12 }}
resources: {{- .Values.containers.controller.resources | toYaml | nindent 12 }}
securityContext:
securityContext:
# The config controller must run as root so the generated vhost files can be made readable to root only.
# The config controller must run as root so the generated vhost files can be made readable to root only.
runAsUser: 0
runAsUser: 0
Loading