diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index efd11c9c32e..64100757bee 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -147,30 +147,14 @@ spec: httpGet: path: /healthz port: 80 - {{- if .Values.livenessProbe.initialDelaySeconds }} - initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}} - {{- else }} initialDelaySeconds: 60 - {{- end }} - {{- if .Values.livenessProbe.periodSeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - {{- else }} periodSeconds: 30 - {{- end }} readinessProbe: httpGet: path: /healthz port: 80 - {{- if .Values.readinessProbe.initialDelaySeconds }} - initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}} - {{- else }} initialDelaySeconds: 5 - {{- end }} - {{- if .Values.readinessProbe.periodSeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - {{- else }} periodSeconds: 30 - {{- end }} resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/chart/tests/deployment_test.yaml b/chart/tests/deployment_test.yaml index 9ce14d6b606..bb368a16cc8 100644 --- a/chart/tests/deployment_test.yaml +++ b/chart/tests/deployment_test.yaml @@ -349,51 +349,3 @@ tests: - equal: path: spec.template.spec.priorityClassName value: "rancher-critical" -- it: should default livenessProbe initialDelaySeconds to 60 - asserts: - - equal: - path: spec.template.spec.containers[0].livenessProbe.initialDelaySeconds - value: 60 -- it: should default livenessProbe periodSeconds to 30 - asserts: - - equal: - path: spec.template.spec.containers[0].livenessProbe.periodSeconds - value: 30 -- it: should default readinessProbe initialDelaySeconds to 5 - asserts: - - equal: - path: spec.template.spec.containers[0].readinessProbe.initialDelaySeconds - value: 5 -- it: should default readinessProbe periodSeconds to 30 - asserts: - - equal: - path: spec.template.spec.containers[0].readinessProbe.periodSeconds - value: 30 -- it: should set livenessProbe initialDelaySeconds to 90 - set: - livenessProbe.initialDelaySeconds: 90 - asserts: - - equal: - path: spec.template.spec.containers[0].livenessProbe.initialDelaySeconds - value: 90 -- it: should set livenessProbe periodSeconds to 60 - set: - livenessProbe.periodSeconds: 60 - asserts: - - equal: - path: spec.template.spec.containers[0].livenessProbe.periodSeconds - value: 60 -- it: should set readinessProbe initialDelaySeconds to 20 - set: - readinessProbe.initialDelaySeconds: 20 - asserts: - - equal: - path: spec.template.spec.containers[0].readinessProbe.initialDelaySeconds - value: 20 -- it: should set readinessProbe periodSeconds to 60 - set: - readinessProbe.periodSeconds: 60 - asserts: - - equal: - path: spec.template.spec.containers[0].readinessProbe.periodSeconds - value: 60 \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index 8c13987af4d..d7889b5be4f 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -161,10 +161,3 @@ postDelete: # Set a bootstrap password. If leave empty, a random password will be generated. bootstrapPassword: "" - -livenessProbe: - initialDelaySeconds: 60 - periodSeconds: 30 -readinessProbe: - initialDelaySeconds: 5 - periodSeconds: 30 \ No newline at end of file