Skip to content

ci: add scout container to celery pod #7354

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

Merged
jennifer-richards merged 2 commits into from
Apr 23, 2024
Merged

ci: add scout container to celery pod #7354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ffba5a
ci: Add scout container to celery pod
jennifer-richards Apr 23, 2024
acfb030
ci: Refactor scoutapm settings in values.yaml
jennifer-richards Apr 23, 2024
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
11 changes: 11 additions & 0 deletions helm/templates/deployments/celery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@ spec:
securityContext:
{{- toYaml $podValues.podSecurityContext | nindent 8 }}
containers:
{{- if .Values.scoutapm }}
- name: "scoutapm"
image: "{{ .Values.scoutapm.image.repository }}:{{ default "latest" .Values.scoutapm.image.tag }}"
imagePullPolicy: {{ default "IfNotPresent" .Values.scoutapm.image.imagePullPolicy }}
livenessProbe:
exec:
command:
- "sh"
- "-c"
- "./core-agent probe --tcp 0.0.0.0:6590 | grep -q 'Agent found'"
{{- end }}
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml $podValues.securityContext | nindent 12 }}
Expand Down
6 changes: 3 additions & 3 deletions helm/templates/deployments/datatracker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ spec:
securityContext:
{{- toYaml $podValues.podSecurityContext | nindent 8 }}
containers:
{{- if $podValues.scoutapm }}
{{- if .Values.scoutapm }}
- name: "scoutapm"
image: "{{ $podValues.scoutapm.image.repository }}:{{ default "latest" $podValues.scoutapm.image.tag }}"
imagePullPolicy: {{ default "IfNotPresent" $podValues.scoutapm.image.imagePullPolicy }}
image: "{{ .Values.scoutapm.image.repository }}:{{ default "latest" .Values.scoutapm.image.tag }}"
imagePullPolicy: {{ default "IfNotPresent" .Values.scoutapm.image.imagePullPolicy }}
livenessProbe:
exec:
command:
Expand Down
15 changes: 9 additions & 6 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,6 @@ datatracker:
nodeSelector: {}

affinity: {}

# Set this to enable a Scout APM Core Agent sidecar
scoutapm:
image:
repository: "scoutapp/scoutapm"
tag: "version-1.4.0"

# -------------------------------------------------------------
# CELERY
Expand Down Expand Up @@ -567,6 +561,15 @@ memcached:

affinity: {}

# -------------------------------------------------------------
# SCOUT APM SETTINGS
# -------------------------------------------------------------
# Set this to enable a Scout APM Core Agent sidecar
scoutapm:
image:
repository: "scoutapp/scoutapm"
tag: "version-1.4.0"

# -------------------------------------------------------------
# PERSISTENT VOLUMES
# -------------------------------------------------------------
Expand Down