chore(controller): add manager url

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -83,6 +83,14 @@ env:
 - name: DRYCC_DATABASE_REPLICA_URL
   value: "postgres://$(DRYCC_DATABASE_USER):$(DRYCC_DATABASE_PASSWORD)@drycc-database-replica.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/controller"
 {{- end }}
+{{- if (.Values.workflowManagerUrl) }}
+- name: WORKFLOW_MANAGER_URL
+  value: "{{ .Values.workflowManagerUrl }}"
+- name: WORKFLOW_MANAGER_ACCESS_KEY
+  value: "{{ .Values.workflowManagerAccessKey }}"
+- name: WORKFLOW_MANAGER_SECRET_KEY
+  value: "{{ .Values.workflowManagerSecretKey }}"
+{{- end }}
 - name: WORKFLOW_NAMESPACE
   valueFrom:
     fieldRef:

charts/controller/values.yaml

@@ -36,6 +36,12 @@ concurrencyPolicy: "Replace"
 # databaseUrl and databaseReplicaUrl are will no longer use the built-in database component
 databaseUrl: ""
 databaseReplicaUrl: ""
+
+# Workflow-manager Configuration Options
+workflowManagerUrl: ""
+workflowManagerAccessKey: ""
+workflowManagerSecretKey: ""
+
 # Configuring this will no longer use the built-in rabbitmq component
 rabbitmqUrl: ""
 # Service

rootfs/api/management/commands/measure_apps.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
     """Management command for push data to manager"""
 
     def handle(self, *args, **options):
-        if settings.WORKFLOW_MANAGER_URL is not None:
+        if settings.WORKFLOW_MANAGER_URL:
             timestamp = time.time()
             task_id = uuid.uuid4().hex
             logger.info(f"pushing {task_id} resources to workflow_manager when {timezone.now()}")

rootfs/api/management/commands/measure_networks.py

@@ -33,7 +33,7 @@ def _measure_networks(self, config_map, timestamp):
         send_measurements.delay(networks)
 
     def handle(self, *args, **options):
-        if settings.WORKFLOW_MANAGER_URL is not None:
+        if settings.WORKFLOW_MANAGER_URL:
             timestamp = int(time.time())
             task_id = uuid.uuid4().hex
             logger.info(f"pushing {task_id} limits to workflow_manager when {timezone.now()}")

rootfs/api/management/commands/measure_resources.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
     """Management command for push data to manager"""
 
     def handle(self, *args, **options):
-        if settings.WORKFLOW_MANAGER_URL is not None:
+        if settings.WORKFLOW_MANAGER_URL:
             timestamp = time.time()
             task_id = uuid.uuid4().hex
             logger.info(f"pushing {task_id} resources to workflow_manager when {timezone.now()}")

rootfs/api/management/commands/measure_volumes.py

@@ -14,7 +14,7 @@ class Command(BaseCommand):
     """Management command for push data to manager"""
 
     def handle(self, *args, **options):
-        if settings.WORKFLOW_MANAGER_URL is not None:
+        if settings.WORKFLOW_MANAGER_URL:
             timestamp = time.time()
             task_id = uuid.uuid4().hex
             logger.info(f"pushing {task_id} volumes to workflow_manager when {timezone.now()}")

rootfs/api/permissions.py

@@ -10,7 +10,7 @@ def get_app_status(app):
     blocklist = Blocklist.get_blocklist(app)
     if blocklist:
         return False, blocklist.remark
-    if settings.WORKFLOW_MANAGER_URL is not None:
+    if settings.WORKFLOW_MANAGER_URL:
         status = manager.User().get_status(app.owner.pk)
         if not status["is_active"]:
             return False, status["message"]

rootfs/api/signals.py

@@ -139,7 +139,7 @@ def create_auth_token_handle(sender, instance=None, created=False, **kwargs):
 @receiver(post_save, sender=App)
 def app_changed_handle(sender, instance=None, created=False, update_fields=None, **kwargs):
     # measure limits to workflow manager
-    if settings.WORKFLOW_MANAGER_URL is not None and (
+    if settings.WORKFLOW_MANAGER_URL and (
         created or (
             update_fields is not None and "structure" in update_fields)):
         timestamp = time.time()
@@ -152,7 +152,7 @@ def app_changed_handle(sender, instance=None, created=False, update_fields=None,
 @receiver(post_save, sender=Config)
 def config_changed_handle(sender, instance=None, created=False, update_fields=None, **kwargs):
     # measure limits to workflow manager
-    if settings.WORKFLOW_MANAGER_URL is not None and (
+    if settings.WORKFLOW_MANAGER_URL and (
         created or (
             update_fields is not None and (
                 "cpu" in update_fields or "memory" in update_fields))):
@@ -166,7 +166,7 @@ def config_changed_handle(sender, instance=None, created=False, update_fields=No
 @receiver(post_save, sender=Volume)
 def volume_changed_handle(sender, instance=None, created=False, update_fields=None, **kwargs):
     # measure volumes to workflow manager
-    if settings.WORKFLOW_MANAGER_URL is not None and created:
+    if settings.WORKFLOW_MANAGER_URL and created:
         timestamp = time.time()
         send_measurements.apply_async(
             args=[instance.to_measurements(timestamp), ],
@@ -184,7 +184,7 @@ def resource_changed_handle(sender, instance=None, created=False, update_fields=
             eta=now() + timedelta(seconds=30)
         )
     # measure resources to workflow manager
-    if settings.WORKFLOW_MANAGER_URL is not None and (
+    if settings.WORKFLOW_MANAGER_URL and (
         created or (
             update_fields is not None and (
                 "plan" in update_fields