Use Helm binary instead of the Go SDK to manage charts

.github/workflows/ci.yaml

@@ -157,10 +157,14 @@ jobs:
   int-tests-kind:
     name: Integration tests (kind)
     runs-on: ubuntu-latest
+    needs:
+      - should-run-int-tests-kind
     if: needs.should-run-int-tests-kind.outputs.run == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # necessary for getting the last tag
       - name: Setup go
         uses: actions/setup-go@v5
         with:
@@ -178,10 +182,14 @@ jobs:
   int-tests-kind-ha-registry:
     name: Integration tests (kind) HA registry
     runs-on: ubuntu-latest
+    needs:
+      - should-run-int-tests-kind
     if: needs.should-run-int-tests-kind.outputs.run == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # necessary for getting the last tag
       - name: Setup go
         uses: actions/setup-go@v5
         with:

.github/workflows/dependencies.yaml

@@ -45,6 +45,13 @@ jobs:
         version=$(gh release list --repo axboe/fio --json name,isLatest | jq -r '.[] | select(.isLatest)|.name' | cut -d- -f2)
         echo "fio version: $version"
         sed -i "/^FIO_VERSION/c\FIO_VERSION = $version" versions.mk
+    - name: Helm
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        version=$(gh release list --repo helm/helm --json tagName,isLatest | jq -r '.[] | select(.isLatest) | .tagName')
+        echo "helm version: $version"
+        sed -i "/^HELM_VERSION/c\HELM_VERSION = $version" versions.mk
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v7
       with:

Makefile

@@ -104,6 +104,23 @@ output/bins/kubectl-support_bundle-%:
 	rm -rf output/tmp
 	touch $@
 
+.PHONY: cmd/installer/goods/bins/helm
+cmd/installer/goods/bins/helm:
+	$(MAKE) output/bins/helm-$(HELM_VERSION)-$(ARCH)
+	cp output/bins/helm-$(HELM_VERSION)-$(ARCH) $@
+	touch $@
+
+output/bins/helm-%:
+	mkdir -p output/bins
+	mkdir -p output/tmp
+	curl --retry 5 --retry-all-errors -fL -o output/tmp/helm.tar.gz \
+		https://get.helm.sh/helm-$(call split-hyphen,$*,1)-$(OS)-$(call split-hyphen,$*,2).tar.gz
+	tar -xzf output/tmp/helm.tar.gz -C output/tmp
+	mv output/tmp/$(OS)-$(call split-hyphen,$*,2)/helm $@
+	rm -rf output/tmp
+	chmod +x $@
+	touch $@
+
 .PHONY: cmd/installer/goods/bins/kubectl-preflight
 cmd/installer/goods/bins/kubectl-preflight:
 	$(MAKE) output/bins/kubectl-preflight-$(TROUBLESHOOT_VERSION)-$(ARCH)
@@ -229,6 +246,7 @@ static: cmd/installer/goods/bins/k0s \
 	cmd/installer/goods/bins/kubectl-support_bundle \
 	cmd/installer/goods/bins/local-artifact-mirror \
 	cmd/installer/goods/bins/fio \
+	cmd/installer/goods/bins/helm \
 	cmd/installer/goods/internal/bins/kubectl-kots
 
 .PHONY: static-dryrun
@@ -238,6 +256,7 @@ static-dryrun:
 		cmd/installer/goods/bins/kubectl-support_bundle \
 		cmd/installer/goods/bins/local-artifact-mirror \
 		cmd/installer/goods/bins/fio \
+		cmd/installer/goods/bins/helm \
 		cmd/installer/goods/internal/bins/kubectl-kots
 
 .PHONY: embedded-cluster-linux-amd64

api/api.go

@@ -9,6 +9,7 @@ import (
 	linuxinstall "github.com/replicatedhq/embedded-cluster/api/controllers/linux/install"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 	"github.com/sirupsen/logrus"
@@ -37,6 +38,7 @@ import (
 type API struct {
 	cfg types.APIConfig
 
+	hcli            helm.Client
 	logger          logrus.FieldLogger
 	metricsReporter metrics.ReporterInterface
 
@@ -93,6 +95,13 @@ func WithMetricsReporter(metricsReporter metrics.ReporterInterface) Option {
 	}
 }
 
+// WithHelmClient configures the helm client for the API.
+func WithHelmClient(hcli helm.Client) Option {
+	return func(a *API) {
+		a.hcli = hcli
+	}
+}
+
 // New creates a new API instance.
 func New(cfg types.APIConfig, opts ...Option) (*API, error) {
 	if cfg.InstallTarget == "" {
@@ -119,6 +128,10 @@ func New(cfg types.APIConfig, opts ...Option) (*API, error) {
 		api.logger = l
 	}
 
+	if err := api.initClients(); err != nil {
+		return nil, fmt.Errorf("init clients: %w", err)
+	}
+
 	if err := api.initHandlers(); err != nil {
 		return nil, fmt.Errorf("init handlers: %w", err)
 	}

api/clients.go

@@ -0,0 +1,88 @@
+package api
+
+import (
+	"fmt"
+
+	"github.com/replicatedhq/embedded-cluster/api/internal/clients"
+	"github.com/replicatedhq/embedded-cluster/api/types"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
+	"github.com/replicatedhq/embedded-cluster/pkg/versions"
+)
+
+func (a *API) initClients() error {
+	if a.hcli == nil {
+		if err := a.initHelmClient(); err != nil {
+			return fmt.Errorf("init helm client: %w", err)
+		}
+	}
+	return nil
+}
+
+// initHelmClient initializes the Helm client based on the installation target
+func (a *API) initHelmClient() error {
+	switch a.cfg.InstallTarget {
+	case types.InstallTargetLinux:
+		return a.initLinuxHelmClient()
+	case types.InstallTargetKubernetes:
+		return a.initKubernetesHelmClient()
+	default:
+		return fmt.Errorf("unsupported install target: %s", a.cfg.InstallTarget)
+	}
+}
+
+// initLinuxHelmClient initializes the Helm client for Linux installations
+func (a *API) initLinuxHelmClient() error {
+	airgapPath := ""
+	if a.cfg.AirgapBundle != "" {
+		airgapPath = a.cfg.RuntimeConfig.EmbeddedClusterChartsSubDir()
+	}
+
+	hcli, err := helm.NewClient(helm.HelmOptions{
+		HelmPath:              a.cfg.RuntimeConfig.PathToEmbeddedClusterBinary("helm"),
+		KubernetesEnvSettings: a.cfg.RuntimeConfig.GetKubernetesEnvSettings(),
+		K8sVersion:            versions.K0sVersion,
+		AirgapPath:            airgapPath,
+	})
+	if err != nil {
+		return fmt.Errorf("create linux helm client: %w", err)
+	}
+
+	a.hcli = hcli
+	return nil
+}
+
+// initKubernetesHelmClient initializes the Helm client for Kubernetes installations
+func (a *API) initKubernetesHelmClient() error {
+	// get the kubernetes version
+	kcli, err := clients.NewDiscoveryClient(clients.KubeClientOptions{
+		RESTClientGetter: a.cfg.Installation.GetKubernetesEnvSettings().RESTClientGetter(),
+	})
+	if err != nil {
+		return fmt.Errorf("create discovery client: %w", err)
+	}
+	k8sVersion, err := kcli.ServerVersion()
+	if err != nil {
+		return fmt.Errorf("get server version: %w", err)
+	}
+
+	// get the helm binary path
+	helmPath, err := a.cfg.Installation.PathToEmbeddedBinary("helm")
+	if err != nil {
+		return fmt.Errorf("get helm path: %w", err)
+	}
+
+	// create the helm client
+	hcli, err := helm.NewClient(helm.HelmOptions{
+		HelmPath:              helmPath,
+		KubernetesEnvSettings: a.cfg.Installation.GetKubernetesEnvSettings(),
+		// TODO: how can we support airgap?
+		AirgapPath: "",
+		K8sVersion: k8sVersion.String(),
+	})
+	if err != nil {
+		return fmt.Errorf("create kubernetes helm client: %w", err)
+	}
+
+	a.hcli = hcli
+	return nil
+}

api/controllers/app/install/controller.go

@@ -13,10 +13,10 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/internal/store"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
 	kyaml "sigs.k8s.io/yaml"
 )
 
@@ -48,9 +48,7 @@ type InstallController struct {
 	clusterID                  string
 	airgapBundle               string
 	privateCACertConfigMapName string
-	k8sVersion                 string
-	restClientGetter           genericclioptions.RESTClientGetter
-	kubeConfigPath             string
+	hcli                       helm.Client
 }
 
 type InstallControllerOption func(*InstallController)
@@ -133,21 +131,9 @@ func WithPrivateCACertConfigMapName(configMapName string) InstallControllerOptio
 	}
 }
 
-func WithK8sVersion(k8sVersion string) InstallControllerOption {
+func WithHelmClient(hcli helm.Client) InstallControllerOption {
 	return func(c *InstallController) {
-		c.k8sVersion = k8sVersion
-	}
-}
-
-func WithRESTClientGetter(restClientGetter genericclioptions.RESTClientGetter) InstallControllerOption {
-	return func(c *InstallController) {
-		c.restClientGetter = restClientGetter
-	}
-}
-
-func WithKubeConfigPath(kubeConfigPath string) InstallControllerOption {
-	return func(c *InstallController) {
-		c.kubeConfigPath = kubeConfigPath
+		c.hcli = hcli
 	}
 }
 
@@ -212,7 +198,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appreleasemanager.WithReleaseData(controller.releaseData),
 			appreleasemanager.WithLicense(license),
 			appreleasemanager.WithPrivateCACertConfigMapName(controller.privateCACertConfigMapName),
-			appreleasemanager.WithK8sVersion(controller.k8sVersion),
+			appreleasemanager.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app release manager: %w", err)
@@ -228,9 +214,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appinstallmanager.WithClusterID(controller.clusterID),
 			appinstallmanager.WithAirgapBundle(controller.airgapBundle),
 			appinstallmanager.WithAppInstallStore(controller.store.AppInstallStore()),
-			appinstallmanager.WithK8sVersion(controller.k8sVersion),
-			appinstallmanager.WithRESTClientGetter(controller.restClientGetter),
-			appinstallmanager.WithKubeConfigPath(controller.kubeConfigPath),
+			appinstallmanager.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install manager: %w", err)

api/controllers/app/install/test_suite.go

@@ -14,6 +14,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/internal/store"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
@@ -132,6 +133,7 @@ func (s *AppInstallControllerTestSuite) TestPatchAppConfigValues() {
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
+			mockHelmClient := &helm.MockClient{}
 			sm := s.CreateStateMachine(tt.currentState)
 
 			controller, err := NewInstallController(
@@ -142,7 +144,7 @@ func (s *AppInstallControllerTestSuite) TestPatchAppConfigValues() {
 				WithAppInstallManager(appInstallManager),
 				WithStore(&store.MockStore{}),
 				WithReleaseData(&release.ReleaseData{}),
-				WithK8sVersion("v1.33.0"),
+				WithHelmClient(mockHelmClient),
 			)
 			require.NoError(t, err, "failed to create install controller")
 
@@ -402,6 +404,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			appConfigManager := &appconfig.MockAppConfigManager{}
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
+			mockHelmClient := &helm.MockClient{}
 			sm := s.CreateStateMachine(tt.currentState)
 			controller, err := NewInstallController(
 				WithStateMachine(sm),
@@ -410,7 +413,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 				WithAppReleaseManager(appReleaseManager),
 				WithStore(&store.MockStore{}),
 				WithReleaseData(&release.ReleaseData{}),
-				WithK8sVersion("v1.33.0"),
+				WithHelmClient(mockHelmClient),
 			)
 			require.NoError(t, err, "failed to create install controller")
 
@@ -473,6 +476,7 @@ func (s *AppInstallControllerTestSuite) TestGetAppInstallStatus() {
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
+			mockHelmClient := &helm.MockClient{}
 			sm := s.CreateStateMachine(states.StateNew)
 
 			controller, err := NewInstallController(
@@ -483,7 +487,7 @@ func (s *AppInstallControllerTestSuite) TestGetAppInstallStatus() {
 				WithAppInstallManager(appInstallManager),
 				WithStore(&store.MockStore{}),
 				WithReleaseData(&release.ReleaseData{}),
-				WithK8sVersion("v1.33.0"),
+				WithHelmClient(mockHelmClient),
 			)
 			require.NoError(t, err, "failed to create install controller")
 
@@ -685,6 +689,7 @@ func (s *AppInstallControllerTestSuite) TestInstallApp() {
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
+			mockHelmClient := &helm.MockClient{}
 			sm := s.CreateStateMachine(tt.currentState)
 
 			controller, err := NewInstallController(
@@ -695,7 +700,7 @@ func (s *AppInstallControllerTestSuite) TestInstallApp() {
 				WithAppInstallManager(appInstallManager),
 				WithStore(&store.MockStore{}),
 				WithReleaseData(&release.ReleaseData{}),
-				WithK8sVersion("v1.33.0"),
+				WithHelmClient(mockHelmClient),
 			)
 			require.NoError(t, err, "failed to create install controller")