feat(helmbroker): add rabbitmq dependencies

Author: duanhongyi

.drone/drone.yml

@@ -126,7 +126,7 @@ name: chart
 steps:
 - name: generate chart
   commands:
-  - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
+  - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && sed -i "s#oci://registry.drycc.cc/charts-testing#oci://registry.drycc.cc/charts#g" charts/manager/Chart.yaml && echo \"${DRONE_TAG:1}\" || echo \"canary\")
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/helmbroker/values.yaml
   - helm package -u charts/helmbroker --version $([ -z $DRONE_TAG ] && echo 1.0.0 || echo ${DRONE_TAG#v})
   - echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin

charts/helmbroker/Chart.yaml

@@ -5,6 +5,9 @@ dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
     version: ~1.1.1
+  - name: rabbitmq
+    repository: oci://registry.drycc.cc/charts-testing
+    version: x.x.x
 description: Drycc Workflow helmbroker.
 maintainers:
   - name: Drycc Team

charts/helmbroker/templates/_helpers.tpl

@@ -7,6 +7,23 @@ env:
   value: {{ if .Values.username | default "" | ne "" }}{{ .Values.username }}{{ else }}{{ randAlphaNum 32 }}{{ end }}
 - name: PASSWORD
   value: {{ if .Values.password | default "" | ne "" }}{{ .Values.password }}{{ else }}{{ randAlphaNum 32 }}{{ end }}
+{{- if (.Values.rabbitmqUrl) }}
+- name: DRYCC_RABBITMQ_URL
+  value: {{ .Values.rabbitmqUrl }}
+{{- else if eq .Values.global.rabbitmqLocation "on-cluster" }}
+- name: "DRYCC_RABBITMQ_USERNAME"
+  valueFrom:
+    secretKeyRef:
+      name: rabbitmq-creds
+      key: username
+- name: "DRYCC_RABBITMQ_PASSWORD"
+  valueFrom:
+    secretKeyRef:
+      name: rabbitmq-creds
+      key: password
+- name: "DRYCC_RABBITMQ_URL"
+  value: "amqp://$(DRYCC_RABBITMQ_USERNAME):$(DRYCC_RABBITMQ_PASSWORD)@drycc-rabbitmq.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:5672/drycc"
+{{- end }}
 {{- range $key, $value := .Values.environment }}
 - name: {{ $key }}
   value: {{ $value | quote }}

charts/helmbroker/values.yaml

@@ -18,10 +18,15 @@ celeryReplicas: 1
 username: admin
 password: admin
 
+# Configuring this will no longer use the built-in rabbitmq component
+rabbitmqUrl: ""
+
+# Any custom controller environment variables
+# can be specified as key-value pairs under environment
+# this is usually a non required setting.
 environment:
-  RESERVED_NAMES: "drycc, drycc-helmbroker"
-  # HELMBROKER_CELERY_BROKER: ""
-  # HELMBROKER_CELERY_BACKEND: ""
+  # DRYCC_DEBUG: true
+  # HELMBROKER_ROOT: /etc/helmbroker
 
 api:
   nodeAffinityPreset: