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

* ci: use datatracker image values for celery/beat

* ci: refactor exec command lists as JSON

---------

Co-authored-by: Robert Sparks <rjsparks@nostrum.com>

helm/templates/deployments/beat.yaml

@@ -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) }}"
+          image: "{{ default $.Values.datatracker.image.repository $podValues.image.repository }}:{{ default .Chart.AppVersion (default $.Values.datatracker.image.tag $podValues.image.tag) }}"
-          imagePullPolicy: {{ default "IfNotPresent" $podValues.image.imagePullPolicy }}
+          imagePullPolicy: {{ default "IfNotPresent" (default $.Values.datatracker.image.imagePullPolicy $podValues.image.imagePullPolicy) }}
           env:
             - name: "CONTAINER_ROLE"
               value: "beat"

helm/templates/deployments/celery.yaml

@@ -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) }}"
+          image: "{{ default $.Values.datatracker.image.repository $podValues.image.repository }}:{{ default .Chart.AppVersion (default $.Values.datatracker.image.tag $podValues.image.tag) }}"
-          imagePullPolicy: {{ default "IfNotPresent" $podValues.image.imagePullPolicy }}
+          imagePullPolicy: {{ default "IfNotPresent" (default $.Values.datatracker.image.imagePullPolicy $podValues.image.imagePullPolicy) }}
           env:
             - name: "CONTAINER_ROLE"
               value: "celery"

helm/values.yaml

@@ -166,9 +166,10 @@ datatracker:
 
 celery:
   name: celery
-  image:
+  image: {}
-    repository: "ghcr.io/ietf-tools/datatracker"
+    # defaults to datatracker settings if not specified separately
-    pullPolicy: IfNotPresent
+    #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: 
+      command: ["celery", "inspect", "ping"] 
-        - celery
-        - inspect
-        - ping
     periodSeconds: 30
     timeoutSeconds: 5
 
@@ -235,10 +233,7 @@ celery:
     successThreshold: 1
     failureThreshold: 60
     exec:
-      command:
+      command: ["celery", "inspect", "ping"]
-        - celery
-        - inspect
-        - ping
 
   # Additional volumes on the output Deployment definition.
   volumes:
@@ -282,9 +277,10 @@ celery:
 
 beat:
   name: beat
-  image:
+  image: {}
-    repository: "ghcr.io/ietf-tools/datatracker"
+    # defaults to datatracker settings if not specified separately
-    pullPolicy: IfNotPresent
+    # 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:
+      command: ["celery", "inspect", "ping"]
-        - celery
-        - inspect
-        - ping
     periodSeconds: 30
     timeoutSeconds: 5
 
@@ -351,10 +344,7 @@ beat:
     successThreshold: 1
     failureThreshold: 60
     exec:
-      command:
+      command: ["celery", "inspect", "ping"]
-        - celery
-        - inspect
-        - ping
 
   # Additional volumes on the output Deployment definition.
   volumes:
@@ -409,10 +399,7 @@ rabbitmq:
 
   livenessProbe:
     exec:
-      command:
+      command: ["rabbitmq-diagnostics", "-q", "ping"]
-        - rabbitmq-diagnostics
-        - -q
-        - ping
     periodSeconds: 30
     timeoutSeconds: 5
 
@@ -466,10 +453,7 @@ rabbitmq:
     successThreshold: 1
     failureThreshold: 60
     exec:
-      command:
+      command: ["rabbitmq-diagnostics", "-q", "ping"]
-        - rabbitmq-diagnostics
-        - -q
-        - ping
 
   # Additional volumes on the output Deployment definition.
   volumes: []