[addon-operator] Remove helm binary using (#597)

Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
Signed-off-by: Yuriy Losev <yuriy.losev@flant.com>
Co-authored-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
Co-authored-by: Yuriy Losev <yuriy.losev@flant.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

docs/src/RUNNING.md

@@ -83,13 +83,7 @@ Default is `heritage=addon-operator`.
 
 ### Helm settings
 
-Addon-operator expects that "helm" binary is available in $PATH. It detects Helm version at start by executing "helm --help" command. If this is not appropriate by some reasons, you can use these settings:
-
-**HELM_BIN_PATH** — a path to a Helm binary.
-
-**HELM_POST_RENDERER_PATH** — a path to a Helm post-renderer binary.
-
-**HELM3** — set to "yes" to disable auto-detection and explicitly enable compatibility with helm3.
+Addon-operator works with helm by using internal lib
 
 **HELM_IGNORE_RELEASE** — a name of the release that should not be treated as the module's release. Prevent self-destruction when addon-operator release is stored in the same namespace as releases for modules.
 

pkg/helm/helm.go

@@ -1,14 +1,12 @@
 package helm
 
 import (
-	"log/slog"
 	"maps"
 	"time"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
 
 	"github.com/flant/addon-operator/pkg/helm/client"
-	"github.com/flant/addon-operator/pkg/helm/helm3"
 	"github.com/flant/addon-operator/pkg/helm/helm3lib"
 )
 
@@ -54,42 +52,28 @@ type Options struct {
 }
 
 func InitHelmClientFactory(helmopts *Options, labels map[string]string) (*ClientFactory, error) {
-	helmVersion, err := DetectHelmVersion()
+	_, err := DetectHelmVersion()
 	if err != nil {
 		return nil, err
 	}
 
 	factory := new(ClientFactory)
 	factory.labels = labels
 
-	switch helmVersion {
-	case Helm3Lib:
-		log.Info("Helm3Lib detected. Use builtin Helm.")
-		factory.ClientType = Helm3Lib
-		factory.NewClientFn = helm3lib.NewClient
-		err = helm3lib.Init(&helm3lib.Options{
-			Namespace:         helmopts.Namespace,
-			HistoryMax:        helmopts.HistoryMax,
-			Timeout:           helmopts.Timeout,
-			HelmIgnoreRelease: helmopts.HelmIgnoreRelease,
-		}, helmopts.Logger)
-
-	case Helm3:
-		log.Info("Helm 3 detected", slog.String("path", helm3.Helm3Path))
-		// Use helm3 client.
-		factory.ClientType = Helm3
-		factory.NewClientFn = helm3.NewClient
-		err = helm3.Init(&helm3.Helm3Options{
-			Namespace:         helmopts.Namespace,
-			HistoryMax:        helmopts.HistoryMax,
-			Timeout:           helmopts.Timeout,
-			HelmIgnoreRelease: helmopts.HelmIgnoreRelease,
-			Logger:            helmopts.Logger,
-		})
-	}
+	log.Info("Helm3Lib detected. Use builtin Helm.")
+
+	factory.ClientType = Helm3Lib
+	factory.NewClientFn = helm3lib.NewClient
 
+	err = helm3lib.Init(&helm3lib.Options{
+		Namespace:         helmopts.Namespace,
+		HistoryMax:        helmopts.HistoryMax,
+		Timeout:           helmopts.Timeout,
+		HelmIgnoreRelease: helmopts.HelmIgnoreRelease,
+	}, helmopts.Logger)
 	if err != nil {
 		return nil, err
 	}
+
 	return factory, nil
 }