Skip to content

Commit 1a02ecd

Browse files
committed
disable liveness checks when zitified - they won't work
1 parent 001376a commit 1a02ecd

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

prometheus-charts/charts/prometheus/templates/server/deploy.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ spec:
8282
- name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}
8383
image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}"
8484
imagePullPolicy: "{{ .Values.server.image.pullPolicy }}"
85-
{{- if .Values.server.env }}
8685
env:
8786
- name: "ZITI_LISTENER_SERVICE_NAME"
8887
value: "{{ .Values.ZITI_LISTENER_SERVICE_NAME }}"
8988
- name: "ZITI_LISTENER_IDENTITY_NAME"
9089
value: "{{ .Values.ZITI_LISTENER_IDENTITY_NAME }}"
9190
- name: "ZITI_LISTENER_IDENTITY_FILE"
9291
value: "{{ .Values.ZITI_LISTENER_IDENTITY_FILE }}"
92+
{{- if .Values.server.env }}
9393
{{ toYaml .Values.server.env | indent 12}}
9494
{{- end }}
9595
args:
@@ -118,6 +118,7 @@ spec:
118118
{{- end }}
119119
ports:
120120
- containerPort: 9090
121+
{{- if .Values.server.readinessProbe.enabled }}
121122
readinessProbe:
122123
{{- if not .Values.server.tcpSocketProbeEnabled }}
123124
httpGet:
@@ -162,6 +163,7 @@ spec:
162163
timeoutSeconds: {{ .Values.server.livenessProbeTimeout }}
163164
failureThreshold: {{ .Values.server.livenessProbeFailureThreshold }}
164165
successThreshold: {{ .Values.server.livenessProbeSuccessThreshold }}
166+
{{- end }}
165167
{{- if .Values.server.startupProbe.enabled }}
166168
startupProbe:
167169
{{- if not .Values.server.tcpSocketProbeEnabled }}

prometheus-charts/charts/prometheus/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,10 @@ server:
10081008
periodSeconds: 5
10091009
failureThreshold: 30
10101010
timeoutSeconds: 10
1011+
# if using zitified listener - ensure this is set to false
1012+
readinessProbe:
1013+
enabled: false
1014+
10111015

10121016
## Prometheus server resource requests and limits
10131017
## Ref: http://kubernetes.io/docs/user-guide/compute-resources/

0 commit comments

Comments
 (0)