fix test name

Signed-off-by: Mikhail Scherba <[email protected]>
flant · Oct 21, 2024 · 024f1d6 · 024f1d6
1 parent beeeaec
commit 024f1d6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 32 deletions.
diff --git a/cmd/addon-operator/main.go b/cmd/addon-operator/main.go
@@ -79,8 +79,7 @@ func start(_ *kingpin.ParseContext) error {
 
 	err := run(ctx, operator)
 	if err != nil {
-		log.Error(err)
-		os.Exit(1)
+		log.Fatal(err)
 	}
 
 	return nil
@@ -90,22 +89,18 @@ func run(ctx context.Context, operator *addon_operator.AddonOperator) error {
 	bk := configmap.New(log.StandardLogger(), operator.KubeClient(), app.Namespace, app.ConfigMapName)
 	operator.SetupKubeConfigManager(bk)
 
-	err := operator.Setup()
-	if err != nil {
-		fmt.Printf("Setup is failed: %s\n", err)
-		os.Exit(1)
+	if err := operator.Setup(); err != nil {
+		log.Fatalf("setup failed: %s\n", err)
 	}
 
-	err = operator.Start(ctx)
-	if err != nil {
-		fmt.Printf("Start is failed: %s\n", err)
-		os.Exit(1)
+	if err := operator.Start(ctx); err != nil {
+		log.Fatalf("start failed: %s\n", err)
 	}
 
 	// Block action by waiting signals from OS.
 	utils_signal.WaitForProcessInterruption(func() {
 		operator.Stop()
-		os.Exit(1)
+		os.Exit(0)
 	})
 
 	return nil
@@ -114,25 +109,22 @@ func run(ctx context.Context, operator *addon_operator.AddonOperator) error {
 func runHAMode(ctx context.Context, operator *addon_operator.AddonOperator) {
 	podName := os.Getenv("ADDON_OPERATOR_POD")
 	if len(podName) == 0 {
-		log.Info("ADDON_OPERATOR_POD env not set or empty")
-		os.Exit(1)
+		log.Fatal("ADDON_OPERATOR_POD env not set or empty")
 	}
 
 	podIP := os.Getenv("ADDON_OPERATOR_LISTEN_ADDRESS")
 	if len(podIP) == 0 {
-		log.Info("ADDON_OPERATOR_LISTEN_ADDRESS env not set or empty")
-		os.Exit(1)
+		log.Fatal("ADDON_OPERATOR_LISTEN_ADDRESS env not set or empty")
 	}
 
 	podNs := os.Getenv("ADDON_OPERATOR_NAMESPACE")
 	if len(podNs) == 0 {
-		log.Info("ADDON_OPERATOR_NAMESPACE env not set or empty")
-		os.Exit(1)
+		log.Fatal("ADDON_OPERATOR_NAMESPACE env not set or empty")
 	}
 
 	identity := fmt.Sprintf("%s.%s.%s.pod", podName, strings.ReplaceAll(podIP, ".", "-"), podNs)
 
-	err := operator.WithLeaderElector(&leaderelection.LeaderElectionConfig{
+	if err := operator.WithLeaderElector(&leaderelection.LeaderElectionConfig{
 		// Create a leaderElectionConfig for leader election
 		Lock: &resourcelock.LeaseLock{
 			LeaseMeta: v1.ObjectMeta{
@@ -151,29 +143,25 @@ func runHAMode(ctx context.Context, operator *addon_operator.AddonOperator) {
 			OnStartedLeading: func(ctx context.Context) {
 				err := run(ctx, operator)
 				if err != nil {
-					log.Info(err)
-					os.Exit(1)
+					log.Fatal(err)
 				}
 			},
 			OnStoppedLeading: func() {
 				log.Info("Restarting because the leadership was handed over")
 				operator.Stop()
-				os.Exit(1)
+				os.Exit(0)
 			},
 		},
 		ReleaseOnCancel: true,
-	})
-	if err != nil {
-		log.Error(err)
+	}); err != nil {
+		log.Fatal(err)
 	}
 
 	go func() {
 		<-ctx.Done()
 		log.Info("Context canceled received")
-		err := syscall.Kill(1, syscall.SIGUSR2)
-		if err != nil {
-			log.Infof("Couldn't shutdown addon-operator: %s\n", err)
-			os.Exit(1)
+		if err := syscall.Kill(1, syscall.SIGUSR2); err != nil {
+			log.Fatalf("Couldn't shutdown addon-operator: %s\n", err)
 		}
 	}()
 

diff --git a/pkg/helm/post_renderer/post_renderer_test.go b/pkg/helm/post_renderer/post_renderer_test.go
@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func Test_DetectHelmVersion(t *testing.T) {
+func Test_Run(t *testing.T) {
 	t.Run("explicit Helm3", func(t *testing.T) {
 		g := NewWithT(t)
 		inputManifests := `apiVersion: ""

diff --git a/pkg/helm_resources_manager/resources_monitor.go b/pkg/helm_resources_manager/resources_monitor.go
@@ -101,7 +101,7 @@ func (r *ResourcesMonitor) Start() {
 				// Check release status
 				status, err := r.GetHelmReleaseStatus(r.moduleName)
 				if err != nil {
-					logEntry.Errorf("Cannot get helm release status: %s", err)
+					logEntry.Errorf("cannot get helm release status: %s", err)
 				}
 
 				if status != "deployed" {
@@ -114,7 +114,7 @@ func (r *ResourcesMonitor) Start() {
 				// Check resources
 				absent, err := r.AbsentResources()
 				if err != nil {
-					logEntry.Errorf("Cannot list helm resources: %s", err)
+					logEntry.Errorf("cannot list helm resources: %s", err)
 				}
 
 				if len(absent) > 0 {
@@ -285,7 +285,7 @@ func (r *ResourcesMonitor) listResources(ctx context.Context, nsgvk namespacedGV
 	log.Debugf("List objects from cache for %v", nsgvk)
 	err := r.cache.List(ctx, objList, cr_client.InNamespace(nsgvk.Namespace))
 	if err != nil {
-		return nil, fmt.Errorf("Couldn't list objects from cache: %v", err)
+		return nil, fmt.Errorf("couldn't list objects from cache: %v", err)
 	}
 
 	existingObjs := make(map[string]struct{}, len(objList.Items))