Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Add option to override initialDelay and period (#39319)" #39551

Merged
merged 1 commit into from
Nov 9, 2022
Merged

Revert "Add option to override initialDelay and period (#39319)" #39551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions chart/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
48 changes: 0 additions & 48 deletions chart/tests/deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 0 additions & 7 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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