fix: watch without namespace path if watching all namespaces (#673)

Signed-off-by: Markus Maga <[email protected]>

Author: Flydiverny

lib/external-secret.js

@@ -22,7 +22,7 @@ function createEventQueue () {
 
 async function startWatcher ({
   kubeClient,
-  namespace,
+  namespace = null,
   customResourceManifest,
   logger,
   eventQueue,
@@ -35,10 +35,15 @@ async function startWatcher ({
     while (true) {
       logger.debug('Starting watch stream for namespace %s', loggedNamespaceName)
 
-      const stream = await kubeClient
+      let api = kubeClient
         .apis[customResourceManifest.spec.group]
         .v1.watch
-        .namespaces(namespace)[customResourceManifest.spec.names.plural]
+
+      if (namespace) {
+        api = api.namespaces(namespace)
+      }
+
+      const stream = await api[customResourceManifest.spec.names.plural]
         .getObjectStream()
 
       let timeout
@@ -101,21 +106,28 @@ function getExternalSecretEvents ({
   return (async function * () {
     const eventQueue = createEventQueue()
 
-    // If the watchedNamespaces is an empty array (i.e. no scoped access),
-    // add an empty element so all ExternalSecret resources in all namespaces will be watched.
-    const namespaceToWatch = watchedNamespaces.length ? watchedNamespaces : ['']
-
-    // Create watcher for each namespace
-    namespaceToWatch.forEach((namespace) => {
+    // If the watchedNamespaces is set create a watcher for each namespace, otherwise create a watcher for all namespaces.
+    if (watchedNamespaces.length) {
+      // Create watcher for each namespace
+      watchedNamespaces.forEach((namespace) => {
+        startWatcher({
+          namespace,
+          kubeClient,
+          customResourceManifest,
+          logger,
+          eventQueue,
+          watchTimeout
+        })
+      })
+    } else {
       startWatcher({
-        namespace,
         kubeClient,
         customResourceManifest,
         logger,
         eventQueue,
         watchTimeout
       })
-    })
+    }
 
     while (true) {
       yield await eventQueue.take()

lib/external-secret.test.js

@@ -37,7 +37,8 @@ describe('getExternalSecretEvents', () => {
                 return {
                   externalsecrets
                 }
-              }
+              },
+              externalsecrets
             }
           }
         }