chore(celery): use quorum queye

Author: duanhongyi

charts/helmbroker/templates/_helpers.tpl

@@ -22,7 +22,7 @@ env:
       name: rabbitmq-creds
       key: password
 - name: "HELMBROKER_RABBITMQ_URL"
-  value: "amqp://$(HELMBROKER_RABBITMQ_USERNAME):$(HELMBROKER_RABBITMQ_PASSWORD)@drycc-rabbitmq.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:5672/drycc"
+  value: "amqp://$(HELMBROKER_RABBITMQ_USERNAME):$(HELMBROKER_RABBITMQ_PASSWORD)@drycc-rabbitmq.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:5672/helmbroker"
 {{- end }}
 {{- if (.Values.redisUrl) }}
 - name: HELMBROKER_REDIS_URL

rootfs/helmbroker/celery.py

@@ -33,43 +33,33 @@ class Config(object):
     task_routes={
         'helmbroker.tasks.provision': {
             'queue': 'helmbroker.high',
-            'exchange': 'helmbroker.priority',
-            'routing_key': 'helmbroker.priority.high',
+            'exchange': 'helmbroker.priority', 'routing_key': 'helmbroker.priority.high',
         },
         'helmbroker.tasks.update': {
             'queue': 'helmbroker.high',
-            'exchange': 'helmbroker.priority',
-            'routing_key': 'helmbroker.priority.high',
+            'exchange': 'helmbroker.priority', 'routing_key': 'helmbroker.priority.high',
         },
         'helmbroker.tasks.bind': {
             'queue': 'helmbroker.high',
-            'exchange': 'helmbroker.priority',
-            'routing_key': 'helmbroker.priority.high',
+            'exchange': 'helmbroker.priority', 'routing_key': 'helmbroker.priority.high',
         },
         'helmbroker.tasks.deprovision': {
             'queue': 'helmbroker.middle',
-            'exchange': 'helmbroker.priority',
-            'routing_key': 'helmbroker.priority.middle',
+            'exchange': 'helmbroker.priority', 'routing_key': 'helmbroker.priority.middle',
         },
     },
     task_queues=(
         Queue(
-            'helmbroker.low',
-            exchange=Exchange('helmbroker.priority', type="direct"),
-            routing_key='helmbroker.priority.low',
-            queue_arguments={'x-max-priority': 16},
+            'helmbroker.low', exchange=Exchange('helmbroker.priority', type="direct"),
+            routing_key='helmbroker.priority.low', queue_arguments={'x-queue-type': 'quorum'},
         ),
         Queue(
-            'helmbroker.high',
-            exchange=Exchange('helmbroker.priority', type="direct"),
-            routing_key='helmbroker.priority.high',
-            queue_arguments={'x-max-priority': 64},
+            'helmbroker.high', exchange=Exchange('helmbroker.priority', type="direct"),
+            routing_key='helmbroker.priority.high', queue_arguments={'x-queue-type': 'quorum'},
         ),
         Queue(
-            'helmbroker.middle',
-            exchange=Exchange('helmbroker.priority', type="direct"),
-            routing_key='helmbroker.priority.middle',
-            queue_arguments={'x-max-priority': 32},
+            'helmbroker.middle', exchange=Exchange('helmbroker.priority', type="direct"),
+            routing_key='helmbroker.priority.middle', queue_arguments={'x-queue-type': 'quorum'},
         ),
     ),
 )

rootfs/requirements.txt

@@ -2,6 +2,6 @@ PyYAML==6.0.1
 gunicorn==22.0.0
 openbrokerapi==4.6.0
 requests==2.31.0
-celery==5.4.0
+celery==5.5.0b3
 redis==5.0.8
-jsonschema==4.21.1
+jsonschema==4.21.1