Skip to content

ci: use datatracker image values for celery/beat #7213

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
rjsparks merged 3 commits into from
Mar 17, 2024
Merged

ci: use datatracker image values for celery/beat #7213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ba2720
ci: use datatracker image values for celery/beat
jennifer-richards Mar 17, 2024
0e042c0
ci: refactor exec command lists as JSON
jennifer-richards Mar 17, 2024
65bfc88
chore: Merge remote-tracking branch 'ietf-tools/feat/helm' into conta…
rjsparks Mar 17, 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
4 changes: 2 additions & 2 deletions helm/templates/deployments/beat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml $podValues.securityContext | nindent 12 }}
image: "{{ $podValues.image.repository }}:{{ default .Chart.AppVersion (default $.Values.datatracker.image.tag $podValues.image.tag) }}"
imagePullPolicy: {{ default "IfNotPresent" $podValues.image.imagePullPolicy }}
image: "{{ default $.Values.datatracker.image.repository $podValues.image.repository }}:{{ default .Chart.AppVersion (default $.Values.datatracker.image.tag $podValues.image.tag) }}"
imagePullPolicy: {{ default "IfNotPresent" (default $.Values.datatracker.image.imagePullPolicy $podValues.image.imagePullPolicy) }}
env:
- name: "CONTAINER_ROLE"
value: "beat"
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/deployments/celery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml $podValues.securityContext | nindent 12 }}
image: "{{ $podValues.image.repository }}:{{ default .Chart.AppVersion (default $.Values.datatracker.image.tag $podValues.image.tag) }}"
imagePullPolicy: {{ default "IfNotPresent" $podValues.image.imagePullPolicy }}
image: "{{ default $.Values.datatracker.image.repository $podValues.image.repository }}:{{ default .Chart.AppVersion (default $.Values.datatracker.image.tag $podValues.image.tag) }}"
imagePullPolicy: {{ default "IfNotPresent" (default $.Values.datatracker.image.imagePullPolicy $podValues.image.imagePullPolicy) }}
env:
- name: "CONTAINER_ROLE"
value: "celery"
Expand Down
44 changes: 14 additions & 30 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,10 @@ datatracker:

celery:
name: celery
image:
repository: "ghcr.io/ietf-tools/datatracker"
pullPolicy: IfNotPresent
image: {}
# defaults to datatracker settings if not specified separately
#repository: "ghcr.io/ietf-tools/datatracker"
#pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
# tag: "v1.1.0"

Expand All @@ -178,10 +179,7 @@ celery:

livenessProbe:
exec:
command:
- celery
- inspect
- ping
command: ["celery", "inspect", "ping"]
periodSeconds: 30
timeoutSeconds: 5

Expand Down Expand Up @@ -235,10 +233,7 @@ celery:
successThreshold: 1
failureThreshold: 60
exec:
command:
- celery
- inspect
- ping
command: ["celery", "inspect", "ping"]

# Additional volumes on the output Deployment definition.
volumes:
Expand Down Expand Up @@ -282,9 +277,10 @@ celery:

beat:
name: beat
image:
repository: "ghcr.io/ietf-tools/datatracker"
pullPolicy: IfNotPresent
image: {}
# defaults to datatracker settings if not specified separately
# repository: "ghcr.io/ietf-tools/datatracker"
# pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
# tag: "v1.1.0"

Expand All @@ -294,10 +290,7 @@ beat:

livenessProbe:
exec:
command:
- celery
- inspect
- ping
command: ["celery", "inspect", "ping"]
periodSeconds: 30
timeoutSeconds: 5

Expand Down Expand Up @@ -351,10 +344,7 @@ beat:
successThreshold: 1
failureThreshold: 60
exec:
command:
- celery
- inspect
- ping
command: ["celery", "inspect", "ping"]

# Additional volumes on the output Deployment definition.
volumes:
Expand Down Expand Up @@ -409,10 +399,7 @@ rabbitmq:

livenessProbe:
exec:
command:
- rabbitmq-diagnostics
- -q
- ping
command: ["rabbitmq-diagnostics", "-q", "ping"]
periodSeconds: 30
timeoutSeconds: 5

Expand Down Expand Up @@ -466,10 +453,7 @@ rabbitmq:
successThreshold: 1
failureThreshold: 60
exec:
command:
- rabbitmq-diagnostics
- -q
- ping
command: ["rabbitmq-diagnostics", "-q", "ping"]

# Additional volumes on the output Deployment definition.
volumes: []
Expand Down