altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
* ci: use datatracker image values for celery/beat

* ci: refactor exec command lists as JSON

---------

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
This commit is contained in:
Jennifer Richards 2024-03-17 12:35:16 +10:00 committed by Nicolas Giard
parent f91ea45813
commit c6372992c6
3 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
helm/templates/deployments/beat.yaml
View file

@ -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"

4
helm/templates/deployments/celery.yaml
View file

@ -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"

44
helm/values.yaml
View file

@ -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"
@ -178,10 +179,7 @@ celery:
livenessProbe:
exec:
command:
- celery
- inspect
- ping
command: ["celery", "inspect", "ping"]
periodSeconds: 30
timeoutSeconds: 5
@ -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:
@ -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"
@ -294,10 +290,7 @@ beat:
livenessProbe:
exec:
command:
- celery
- inspect
- ping
command: ["celery", "inspect", "ping"]
periodSeconds: 30
timeoutSeconds: 5
@ -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:
@ -409,10 +399,7 @@ rabbitmq:
livenessProbe:
exec:
command:
- rabbitmq-diagnostics
- -q
- ping
command: ["rabbitmq-diagnostics", "-q", "ping"]
periodSeconds: 30
timeoutSeconds: 5
@ -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: []