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

make probes on streaming and web deployments user configurable #10

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

make probes on streaming and web deployments user configurable #10

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c923144
make probes on streaming and web deployments user configurable with e…
jstewart612 Dec 7, 2022
fc817e8
remove path duplication from deployment-streaming for new values
jstewart612 Dec 8, 2022
1e3c4ef
remove path duplication from deployment-web for new values
jstewart612 Dec 8, 2022
a6d5338
set startupProbe by default of streaming to same pattern as web so we…
jstewart612 Dec 8, 2022
2e7ed22
reduce failureThreshold and periodSeconds of startupProbes so contain…
jstewart612 Dec 8, 2022
a018a90
update to sisheogorath requested default values
jstewart612 Dec 12, 2022
b42a053
Merge branch 'main' into main
jstewart612 Mar 10, 2023
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
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 4.0.0
version: 4.1.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
16 changes: 10 additions & 6 deletions templates/deployment-streaming.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,18 @@ spec:
- name: streaming
containerPort: {{ .Values.mastodon.streaming.port }}
protocol: TCP
{{- if .Values.mastodon.streaming.livenessProbe }}
jstewart612 marked this conversation as resolved.
Show resolved Hide resolved
livenessProbe:
httpGet:
path: /api/v1/streaming/health
port: streaming
{{- toYaml .Values.mastodon.streaming.livenessProbe | nindent 12 }}
{{- end }}
{{- if .Values.mastodon.streaming.readinessProbe }}
readinessProbe:
httpGet:
path: /api/v1/streaming/health
port: streaming
{{- toYaml .Values.mastodon.streaming.readinessProbe | nindent 12 }}
{{- end }}
{{- if .Values.mastodon.streaming.startupProbe }}
startupProbe:
{{- toYaml .Values.mastodon.streaming.startupProbe | nindent 12 }}
{{- end }}
{{- with (default .Values.resources .Values.mastodon.streaming.resources) }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
19 changes: 9 additions & 10 deletions templates/deployment-web.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,18 @@ spec:
- name: http
containerPort: {{ .Values.mastodon.web.port }}
protocol: TCP
{{- if .Values.mastodon.web.livenessProbe }}
livenessProbe:
tcpSocket:
port: http
{{- toYaml .Values.mastodon.web.livenessProbe | nindent 12 }}
{{- end }}
{{- if .Values.mastodon.web.readinessProbe }}
readinessProbe:
httpGet:
path: /health
port: http
{{- toYaml .Values.mastodon.web.readinessProbe | nindent 12 }}
{{- end }}
{{- if .Values.mastodon.web.startupProbe }}
startupProbe:
httpGet:
path: /health
port: http
failureThreshold: 30
periodSeconds: 5
{{- toYaml .Values.mastodon.web.startupProbe | nindent 12 }}
{{- end }}
{{- with (default .Values.resources .Values.mastodon.web.resources) }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
23 changes: 23 additions & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,15 @@ mastodon:
# requests:
# cpu: 250m
# memory: 128Mi
# -- (Streaming Deployment) liveness and readiness probes
livenessProbe:
httpGet:
path: /api/v1/streaming/health
port: streaming
readinessProbe:
httpGet:
path: /api/v1/streaming/health
port: streaming
jstewart612 marked this conversation as resolved.
Show resolved Hide resolved
web:
port: 3000
# -- Number of Web Pods running
Expand All @@ -187,6 +196,20 @@ mastodon:
# requests:
# cpu: 250m
# memory: 768Mi
# -- (Web Deployment) liveness and readiness probes
livenessProbe:
tcpSocket:
port: http
readinessProbe:
httpGet:
path: /health
port: http
startupProbe:
httpGet:
path: /health
port: http
failureThreshold: 30
periodSeconds: 5

metrics:
statsd:
Expand Down