Update redis-consumer helm chart for 0.9.0 release. (#417)

* Update the `redis_consumer` chart to 0.3.0 using application version 0.9.0. * Combine `GKE_STORAGE_BUCKET` and `AWS_S3_BUCKET` into single `STORAGE_BUCKET`. * Replace `DEBUG` with `LOG_LEVEL`. * Remove `CLOUD_PROVIDER` and other unused env for all consumers. * Move `segmentation-zip-consumer` into the same space as `segmentation-consumer`. * Add the `tracking-zip-consumer` helmfile and prometheus metric.
vanvalenlab · Feb 11, 2021 · 2b67f79 · 2b67f79
1 parent 5a3af5c
commit 2b67f79
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 30 deletions.
diff --git a/conf/charts/redis-consumer/Chart.yaml b/conf/charts/redis-consumer/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: redis-consumer
-version: 0.2.1
+version: 0.3.0
 #kubeVersion: ^1.9.8
 description: This project consumes and processes redis event, placing the final result back to redis.
 keywords:
@@ -13,6 +13,6 @@ maintainers:
     email: bbannon@caltech.edu
     url: vanvalen.caltech.edu
 engine: gotpl
-appVersion: 0.8.3
+appVersion: 0.9.0
 deprecated: false
 tillerVersion: ^2.9.1
diff --git a/conf/charts/redis-consumer/values.yaml b/conf/charts/redis-consumer/values.yaml
@@ -6,7 +6,7 @@ replicas: 1
 
 image:
   repository: vanvalenlab/kiosk-redis-consumer
-  tag: 0.8.3
+  tag: 0.9.0
   pullPolicy: IfNotPresent
 
 resources: {}
@@ -34,7 +34,7 @@ hpa:
   metrics: {}
 
 env:
-  DEBUG: "True"
+  LOG_LEVEL: "DEBUG"
   INTERVAL: 10
   CONSUMER_TYPE: "image"
   QUEUE: "segmentation"
@@ -56,7 +56,6 @@ env:
   TF_MAX_BATCH_SIZE: 1
   TF_MIN_MODEL_SIZE: 128
 
-  CLOUD_PROVIDER: "aws"
   AWS_REGION: "us-east-1"
   GKE_COMPUTE_ZONE: "us-west1-b"
 
@@ -85,5 +84,4 @@ env:
 secrets:
   AWS_ACCESS_KEY_ID: ""
   AWS_SECRET_ACCESS_KEY: ""
-  AWS_S3_BUCKET: "s3://example-bucket"
-  GKE_BUCKET: "gs://example-bucket"
+  STORAGE_BUCKET: "gs://example-bucket"
diff --git a/conf/helmfile.d/0230.segmentation-consumer.yaml b/conf/helmfile.d/0230.segmentation-consumer.yaml
@@ -17,7 +17,7 @@ releases:
     vendor: vanvalenlab
     default: true
   chart: '{{ env "CHARTS_PATH" | default "/conf/charts" }}/redis-consumer'
-  version: 0.2.1
+  version: 0.3.0
   wait: true
   timeout: 300
   atomic: true
@@ -27,7 +27,7 @@ releases:
 
       image:
         repository: vanvalenlab/kiosk-redis-consumer
-        tag: 0.8.3
+        tag: 0.9.0
 
       nameOverride: segmentation-consumer
 
@@ -62,7 +62,6 @@ releases:
             targetValue: .15
 
       env:
-        DEBUG: "true"
         INTERVAL: 1
         QUEUE: "segmentation"
         CONSUMER_TYPE: "image"
@@ -81,7 +80,6 @@ releases:
         TF_MIN_MODEL_SIZE: 128
 
         AWS_REGION: '{{ env "AWS_REGION" | default "us-east-1" }}'
-        CLOUD_PROVIDER: '{{ env "CLOUD_PROVIDER" | default "aws" }}'
         GKE_COMPUTE_ZONE: '{{ env "GKE_COMPUTE_ZONE" | default "us-west1-b" }}'
 
         NUCLEAR_MODEL: "NuclearSegmentation:0"
@@ -102,5 +100,8 @@ releases:
       secrets:
         AWS_ACCESS_KEY_ID: '{{ env "AWS_ACCESS_KEY_ID" | default "NA" }}'
         AWS_SECRET_ACCESS_KEY: '{{ env "AWS_SECRET_ACCESS_KEY" | default "NA" }}'
-        AWS_S3_BUCKET: '{{ env "AWS_S3_BUCKET" | default "NA" }}'
-        GKE_BUCKET: '{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ if eq (env "CLOUD_PROVIDER" | default "aws") "aws" }}
+        STORAGE_BUCKET: 's3://{{ env "AWS_S3_BUCKET" | default "NA" }}'
+{{ else }}
+        STORAGE_BUCKET: 'gs://{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ end }}
diff --git a/...ile.d/0240.segmentation-zip-consumer.yaml → ...ile.d/0231.segmentation-zip-consumer.yaml b/...ile.d/0240.segmentation-zip-consumer.yaml → ...ile.d/0231.segmentation-zip-consumer.yaml
@@ -17,7 +17,7 @@ releases:
     vendor: vanvalenlab
     default: true
   chart: '{{ env "CHARTS_PATH" | default "/conf/charts" }}/redis-consumer'
-  version: 0.2.1
+  version: 0.3.0
   wait: true
   timeout: 300
   atomic: true
@@ -27,7 +27,7 @@ releases:
 
       image:
         repository: vanvalenlab/kiosk-redis-consumer
-        tag: 0.8.3
+        tag: 0.9.0
 
       nameOverride: segmentation-zip-consumer
 
@@ -67,9 +67,7 @@ releases:
         REDIS_PORT: "26379"
         TF_HOST: "tf-serving"
         TF_PORT: "8500"
-        DEBUG: "true"
         AWS_REGION: '{{ env "AWS_REGION" | default "us-east-1" }}'
-        CLOUD_PROVIDER: '{{ env "CLOUD_PROVIDER" | default "aws" }}'
         GKE_COMPUTE_ZONE: '{{ env "GKE_COMPUTE_ZONE" | default "us-west1-b" }}'
         CONSUMER_TYPE: "zip"
         LABEL_DETECT_ENABLED: "true"
@@ -78,5 +76,8 @@ releases:
       secrets:
         AWS_ACCESS_KEY_ID: '{{ env "AWS_ACCESS_KEY_ID" | default "NA" }}'
         AWS_SECRET_ACCESS_KEY: '{{ env "AWS_SECRET_ACCESS_KEY" | default "NA" }}'
-        AWS_S3_BUCKET: '{{ env "AWS_S3_BUCKET" | default "NA" }}'
-        GKE_BUCKET: '{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ if eq (env "CLOUD_PROVIDER" | default "aws") "aws" }}
+        STORAGE_BUCKET: 's3://{{ env "AWS_S3_BUCKET" | default "NA" }}'
+{{ else }}
+        STORAGE_BUCKET: 'gs://{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ end }}
diff --git a/conf/helmfile.d/0250.tracking-consumer.yaml b/conf/helmfile.d/0250.tracking-consumer.yaml
@@ -17,7 +17,7 @@ releases:
     vendor: vanvalenlab
     default: true
   chart: '{{ env "CHARTS_PATH" | default "/conf/charts" }}/redis-consumer'
-  version: 0.2.1
+  version: 0.3.0
   wait: true
   timeout: 300
   atomic: true
@@ -27,7 +27,7 @@ releases:
 
       image:
         repository: vanvalenlab/kiosk-redis-consumer
-        tag: 0.8.3
+        tag: 0.9.0
 
       nameOverride: tracking-consumer
 
@@ -62,7 +62,6 @@ releases:
             targetValue: 1
 
       env:
-        DEBUG: "true"
         INTERVAL: 1
         QUEUE: "tracking"
         SEGMENTATION_QUEUE: "segmentation"
@@ -82,7 +81,6 @@ releases:
         TF_MIN_MODEL_SIZE: 128
 
         AWS_REGION: '{{ env "AWS_REGION" | default "us-east-1" }}'
-        CLOUD_PROVIDER: '{{ env "CLOUD_PROVIDER" | default "aws" }}'
         GKE_COMPUTE_ZONE: '{{ env "GKE_COMPUTE_ZONE" | default "us-west1-b" }}'
 
         NUCLEAR_MODEL: "NuclearSegmentation:0"
@@ -100,15 +98,14 @@ releases:
         SCALE_DETECT_ENABLED: "true"
         SCALE_DETECT_MODEL: "ScaleDetection:0"
 
-        DRIFT_CORRECT_ENABLED: "false"
-        NORMALIZE_TRACKING: "true"
-
         TRACKING_MODEL: "tracking_model_benchmarking_757_step5_20epoch_80split_9tl:1"
-        TRACKING_SEGMENT_MODEL: "NuclearSegmentation:0"
-        TRACKING_POSTPROCESS_FUNCTION: "deep_watershed"
+        DRIFT_CORRECT_ENABLED: "false"
 
       secrets:
         AWS_ACCESS_KEY_ID: '{{ env "AWS_ACCESS_KEY_ID" | default "NA" }}'
         AWS_SECRET_ACCESS_KEY: '{{ env "AWS_SECRET_ACCESS_KEY" | default "NA" }}'
-        AWS_S3_BUCKET: '{{ env "AWS_S3_BUCKET" | default "NA" }}'
-        GKE_BUCKET: '{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ if eq (env "CLOUD_PROVIDER" | default "aws") "aws" }}
+        STORAGE_BUCKET: 's3://{{ env "AWS_S3_BUCKET" | default "NA" }}'
+{{ else }}
+        STORAGE_BUCKET: 'gs://{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ end }}
diff --git a/conf/helmfile.d/0251.tracking-zip-consumer.yaml b/conf/helmfile.d/0251.tracking-zip-consumer.yaml
@@ -0,0 +1,83 @@
+releases:
+
+################################################################################
+## Tracking Zip Consumer #######################################################
+################################################################################
+
+#
+# References:
+#   - https://github.com/vanvalenlab/kiosk-console/blob/master/conf/charts/redis-consumer/values.yaml
+#
+- name: tracking-zip-consumer
+  namespace: deepcell
+  labels:
+    chart: redis-consumer
+    component: deepcell
+    namespace: deepcell
+    vendor: vanvalenlab
+    default: true
+  chart: '{{ env "CHARTS_PATH" | default "/conf/charts" }}/redis-consumer'
+  version: 0.3.0
+  wait: true
+  timeout: 300
+  atomic: true
+  cleanupOnFail: true
+  values:
+    - replicas: 1
+
+      image:
+        repository: vanvalenlab/kiosk-redis-consumer
+        tag: 0.9.0
+
+      nameOverride: tracking-zip-consumer
+
+      resources:
+        requests:
+          cpu: 200m
+          memory: 128Mi
+        # limits:
+        #   cpu: 100m
+        #   memory: 1024Mi
+
+      tolerations:
+        - key: consumer
+          operator: Exists
+          effect: NoSchedule
+
+      nodeSelector:
+        consumer: "yes"
+
+      hpa:
+        enabled: true
+        minReplicas: 1
+        maxReplicas: {{ mul (int (env "GPU_NODE_MAX_SIZE" | default 1)) 100 }}
+        metrics:
+        - type: Object
+          object:
+            metricName: tracking_zip_consumer_key_ratio
+            target:
+              apiVersion: v1
+              kind: Namespace
+              name: tracking_zip_consumer_key_ratio
+            targetValue: 2
+
+      env:
+        QUEUE: "tracking"
+        REDIS_HOST: "redis"
+        REDIS_PORT: "26379"
+        TF_HOST: "tf-serving"
+        TF_PORT: "8500"
+        AWS_REGION: '{{ env "AWS_REGION" | default "us-east-1" }}'
+        GKE_COMPUTE_ZONE: '{{ env "GKE_COMPUTE_ZONE" | default "us-west1-b" }}'
+        CONSUMER_TYPE: "zip"
+        LABEL_DETECT_ENABLED: "true"
+        SCALE_DETECT_ENABLED: "true"
+
+      secrets:
+        AWS_ACCESS_KEY_ID: '{{ env "AWS_ACCESS_KEY_ID" | default "NA" }}'
+        AWS_SECRET_ACCESS_KEY: '{{ env "AWS_SECRET_ACCESS_KEY" | default "NA" }}'
+{{ if eq (env "CLOUD_PROVIDER" | default "aws") "aws" }}
+        STORAGE_BUCKET: 's3://{{ env "AWS_S3_BUCKET" | default "NA" }}'
+{{ else }}
+        STORAGE_BUCKET: 'gs://{{ env "CLOUDSDK_BUCKET" | default "NA" }}'
+{{ end }}
diff --git a/conf/helmfile.d/0600.prometheus-operator.yaml b/conf/helmfile.d/0600.prometheus-operator.yaml
@@ -289,6 +289,13 @@ releases:
             labels:
               deployment: tracking-consumer
               namespace: deepcell
+          - record: tracking_zip_consumer_key_ratio
+            expr: |-
+              consumer_key_ratio{deployment="tracking-zip-consumer"}
+              * on() tf_serving_up
+            labels:
+              deployment: tracking-zip-consumer
+              namespace: deepcell
 
       ## Configuration for alertmanager
       ## ref: https://prometheus.io/docs/alerting/alertmanager/