Merge pull request #618 from kthcloud/dev

Maintenance Update
kthcloud · May 24, 2024 · d7cc7aa · d7cc7aa
2 parents 9b41bac + 9ffbc10
commit d7cc7aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pkg/services/status_update/deployment_status_listener.go b/pkg/services/status_update/deployment_status_listener.go
@@ -61,7 +61,7 @@ func DeploymentStatusListener(ctx context.Context) error {
 }
 
 func DeploymentEventListener(ctx context.Context) error {
-	for _, zone := range config.Config.Zones {
+	for _, zone := range config.Config.EnabledZones() {
 		if !zone.HasCapability(configModels.ZoneCapabilityDeployment) {
 			continue
 		}

diff --git a/pkg/services/workers.go b/pkg/services/workers.go
@@ -19,6 +19,7 @@ func Worker(ctx context.Context, name string, work func(context.Context) error)
 		err := work(internalCtx)
 		if err != nil {
 			utils.PrettyPrintError(fmt.Errorf("%s failed: %w", name, err))
+			cancel()
 		}
 	}()
 

diff --git a/pkg/subsystems/k8s/status.go b/pkg/subsystems/k8s/status.go
@@ -3,6 +3,7 @@ package k8s
 import (
 	"context"
 	"fmt"
+	"go-deploy/pkg/log"
 	"go-deploy/pkg/subsystems/k8s/keys"
 	"go-deploy/pkg/subsystems/k8s/models"
 	"go-deploy/pkg/subsystems/k8s/opts"
@@ -88,7 +89,7 @@ func (client *Client) deploymentStatusWatcher(ctx context.Context, handler func(
 				watcher.Stop()
 				watcher, err = setupDeploymentWatcher(client.Namespace)
 				if err != nil {
-					fmt.Println("Failed to restart Deployment status watcher, sleeping for 10 seconds before retrying")
+					log.Println("Failed to restart Deployment status watcher, sleeping for 10 seconds before retrying")
 					time.Sleep(10 * time.Second)
 					return
 				}
@@ -145,7 +146,7 @@ func (client *Client) vmStatusWatcher(ctx context.Context, handler func(string,
 				watcher.Stop()
 				watcher, err = setupVmWatcher(client.Namespace)
 				if err != nil {
-					fmt.Println("Failed to restart VM status watcher, sleeping for 10 seconds before retrying")
+					log.Println("Failed to restart VM status watcher, sleeping for 10 seconds before retrying")
 					time.Sleep(10 * time.Second)
 					return
 				}
@@ -208,7 +209,7 @@ func (client *Client) vmiStatusWatcher(ctx context.Context, handler func(string,
 				watcher.Stop()
 				watcher, err = setupVmWatcher(client.Namespace)
 				if err != nil {
-					fmt.Println("Failed to restart VM status watcher, sleeping for 10 seconds before retrying")
+					log.Println("Failed to restart VM instance status watcher, sleeping for 10 seconds before retrying")
 					time.Sleep(10 * time.Second)
 					return
 				}
@@ -355,7 +356,7 @@ func (client *Client) eventWatcher(ctx context.Context, handler func(string, int
 				watcher.Stop()
 				watcher, err = setupEventWatcher(client.Namespace)
 				if err != nil {
-					fmt.Println("Failed to restart Event status watcher, sleeping for 10 seconds before retrying")
+					log.Println("Failed to restart Event status watcher, sleeping for 10 seconds before retrying")
 					time.Sleep(10 * time.Second)
 					return
 				}