Merge branch 'k8s-update-fixes' into 'main'

Fix for flower and flask and k8 integration

See merge request !1

gwcelery/templates/flask.yaml

@@ -21,11 +21,15 @@ spec:
         - name: flask
           image: {{ include "gwcelery.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: ["gwcelery", "flask", "run", "-h", "0.0.0.0"]
+          args: ["flask", "run", "-h", "0.0.0.0"]
           env:
             {{- include "gwcelery.celery.base.env" . | nindent 12 }}
             - name: APP_PREFIX
               value: /flask
+            - name: FLASK_RUN_PORT
+              value: "5000"
+            - name: FLASK_URL_PREFIX
+              value: "/flask"
           volumeMounts: {{- include "gwcelery.celery.base.volumeMounts" . | nindent 12 }}
           ports:
             - name: http

gwcelery/templates/flower.yaml

@@ -12,6 +12,7 @@ spec:
     metadata:
       labels:
         app: *name
+      annotations: {{- include "gwcelery.celery.configHash" . | nindent 8 }}
     spec:
       {{- include "gwcelery.celery.hostAliases" . | nindent 6 }}
       imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 8 }}
@@ -20,7 +21,9 @@ spec:
         - name: flower
           image: {{ include "gwcelery.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          args: ["gwcelery", "flower", "--url-prefix=flower/"]
+          args:
+            - "flower"
+            - "--url-prefix=flower/"
           env: {{- include "gwcelery.celery.base.env" . | nindent 12 }}
           ports:
             - name: http

gwcelery/values.yaml

@@ -20,7 +20,7 @@ gracedbSandboxed:
 
 image:
   repository: containers.ligo.org/emfollow/gwcelery
-  tag: "v2.4.4"
+  tag: "v2.5.1"
   pullPolicy: IfNotPresent
 
 probes:
@@ -36,8 +36,8 @@ probes:
 storageClassName: "standard"
 
 ingress:
-  enabled: "false"
-  #host: "emfollow-test01.igwn.org"
+  enabled: "true"
+  host: "gwcelery.default.svc.cluster.local"
 
 # This is for Redis
 brokerUrl: ""
@@ -122,13 +122,13 @@ openmp:
   threads: 2
 
 flask:
-  enabled: false
+  enabled: true
   replicas: 1
   resources:
     cpu: 0.5
     memory: 2Gi
   service:
-    type: ClusterIP
+    type: LoadBalancer
 
 
 flower:
@@ -138,7 +138,7 @@ flower:
     cpu: 0.5
     memory: 2Gi
   service:
-    type: ClusterIP
+    type: LoadBalancer
 
 superevent:
   enabled: true