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

Probes are defaulted on, but can be totally overriden #41

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Probes are defaulted on, but can be totally overriden #41

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions helm/kitcaddy/templates/kitcaddy-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,26 +120,14 @@ spec:
- -config
- /config/config.json
env: []
{{- if .Values.kitcaddy.startupProbe }}
startupProbe:
failureThreshold: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.failureThreshold | default 5 }}{{ else }}5{{ end }}
httpGet:
path: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.path | default "/metrics" }}{{ else }}/metrics{{ end }}
port: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.port | default 80 }}{{ else }}80{{ end }}
scheme: HTTP
initialDelaySeconds: {{ if and .Values.kitcaddy .Values.kitcaddy.startupProbe }}{{ .Values.kitcaddy.startupProbe.initialDelaySeconds | default 50 }}{{ else }}50{{ end }}
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
{{- toYaml .Values.kitcaddy.startupProbe | nindent 12 }}
{{- end }}
{{- if .Values.kitcaddy.readinessProbe }}
readinessProbe:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nu vi er så godt i gang med at pille, burde vi ikke give mulighed for at definere en liveness probe også?

failureThreshold: 3
httpGet:
path: {{ if and .Values.kitcaddy .Values.kitcaddy.readinessProbe }}{{ .Values.kitcaddy.readinessProbe.path | default "/metrics" }}{{ else }}/metrics{{ end }}
port: {{ if and .Values.kitcaddy .Values.kitcaddy.readinessProbe }}{{ .Values.kitcaddy.readinessProbe.port | default 80 }}{{ else }}80{{ end }}
scheme: HTTP
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1
timeoutSeconds: 1
{{- toYaml .Values.kitcaddy.readinessProbe | nindent 12 }}
{{- end }}
image: "{{ .Values.kitcaddy.image.repository }}:{{ .Values.kitcaddy.image.tag | default .Chart.AppVersion }}"
ports:
- containerPort: 80
Expand Down
26 changes: 20 additions & 6 deletions helm/kitcaddy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,31 @@ netpol:
enabled: true

kitcaddy:
startupProbe:
failureThreshold: 5
httpGet:
path: /metrics
port: 80
scheme: HTTP
initialDelaySeconds: 50
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jeg synes ikke jeg oplever at det er normalt at det tager så lang tid for Kitcaddy for at være klar. Normalt plejer Kitcaddy at starte op på meget kort tid (< 1sek).

Kan det være en ting i Netic miljøet der gør at det tager så lang tid? Så synes jeg default skal være lavere, så det ikke går ud over andre anvendere af Kitcaddy.

periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
readinessProbe:
failureThreshold: 3
httpGet:
path: /metrics
port: 80
scheme: HTTP
initialDelaySeconds: 5
periodSeconds: 5
successThreshold: 1
timeoutSeconds: 1
logLevel: INFO
admin:
disabled: true
image:
repository: kvalitetsit/kitcaddy
startupProbe:
path: /metrics
port: 80
readinessProbe:
path: /metrics
port: 80
resources:
limits:
cpu: 100m
Expand Down
12 changes: 12 additions & 0 deletions helm/kitcaddyExampleValues.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ serviceAccount:
deploymentStrategy: Recreate

kitcaddy:
startupProbe: null
readinessProbe:
httpGet:
path: /metrics
port: 80
scheme: HTTP
initialDelaySeconds: 5
failureThreshold: 3
periodSeconds: 5
successThreshold: 1
timeoutSeconds: 1

secretName: sts-public-cert
extraVolumeMounts:
sts-public-cert:
Expand Down
Loading