From 4ef498b097e05d27b12a87b5feab2695dddb46fc Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Wed, 2 Nov 2022 18:52:25 +1100
Subject: [PATCH] refactor: enable single queue by default so the controller
 listens to all queues

---
 .github/workflows/remote-controller.yaml | 1 -
 config/default/config.properties         | 3 +--
 config/default/envs.yaml                 | 7 +------
 main.go                                  | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/remote-controller.yaml b/.github/workflows/remote-controller.yaml
index e5d7fcf..2963801 100644
--- a/.github/workflows/remote-controller.yaml
+++ b/.github/workflows/remote-controller.yaml
@@ -111,6 +111,5 @@ jobs:
         export HARBOR_API="http://harbor.$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080/api"
         export KIND_NODE_IP="$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[0].address}')"
         export HARBOR_VERSION=${{matrix.harbor}}
-        export ENABLE_SINGLE_QUEUE=true
         # export GO111MODULE=on
         make controller-test
\ No newline at end of file
diff --git a/config/default/config.properties b/config/default/config.properties
index 959af73..8d18a39 100644
--- a/config/default/config.properties
+++ b/config/default/config.properties
@@ -1,4 +1,3 @@
 OVERRIDE_BUILD_DEPLOY_DIND_IMAGE
 HARBOR_URL
-HARBOR_API
-ENABLE_SINGLE_QUEUE
\ No newline at end of file
+HARBOR_API
\ No newline at end of file
diff --git a/config/default/envs.yaml b/config/default/envs.yaml
index 719272a..da121b7 100644
--- a/config/default/envs.yaml
+++ b/config/default/envs.yaml
@@ -35,9 +35,4 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: overrides
-                  key: HARBOR_API
-            - name: ENABLE_SINGLE_QUEUE
-              valueFrom:
-                configMapKeyRef:
-                  name: overrides
-                  key: ENABLE_SINGLE_QUEUE
\ No newline at end of file
+                  key: HARBOR_API
\ No newline at end of file
diff --git a/main.go b/main.go
index d6d1d03..ec32f35 100644
--- a/main.go
+++ b/main.go
@@ -183,7 +183,7 @@ func main() {
 		"The number of workers to start with.")
 	flag.IntVar(&rabbitRetryInterval, "rabbitmq-retry-interval", 30,
 		"The retry interval for rabbitmq.")
-	flag.BoolVar(&enableSingleQueue, "enable-single-queue", false, "Flag to have this controller use the single queue option.")
+	flag.BoolVar(&enableSingleQueue, "enable-single-queue", true, "Flag to have this controller use the single queue option.")
 	flag.StringVar(&leaderElectionID, "leader-election-id", "lagoon-builddeploy-leader-election-helper",
 		"The ID to use for leader election.")
 	flag.StringVar(&pendingMessageCron, "pending-message-cron", "15,45 * * * *",