Merge pull request #3121 from devspace-sh/DSP-156

Update loft utils for helm v4

Author: zerbitx

.github/workflows/unit-tests.yaml

@@ -21,10 +21,10 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-    
+
     name: unit-test-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    
+
     steps:
       - name: Set up Go
         uses: actions/setup-go@v5

cmd/init.go

@@ -35,7 +35,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/survey"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"github.com/mgutz/ansi"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

cmd/run.go

@@ -20,7 +20,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/exit"
 	"github.com/loft-sh/devspace/pkg/util/interrupt"
 	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/loft-util/pkg/command"
+	"github.com/loft-sh/utils/pkg/command"
 	"mvdan.cc/sh/v3/interp"
 
 	"github.com/loft-sh/devspace/cmd/flags"

e2e/tests/render/testdata/helm/rendered.txt

@@ -9,7 +9,7 @@ metadata:
     "app.kubernetes.io/component": "test"
     "app.kubernetes.io/managed-by": "Helm"
   annotations:
-    "helm.sh/chart": "component-chart-0.9.1"
+    "helm.sh/chart": "component-chart-0.9.2"
 spec:
   replicas: 1
   strategy:
@@ -26,7 +26,7 @@ spec:
         "app.kubernetes.io/component": "test"
         "app.kubernetes.io/managed-by": "Helm"
       annotations:
-        "helm.sh/chart": "component-chart-0.9.1"
+        "helm.sh/chart": "component-chart-0.9.2"
     spec:
       imagePullSecrets:
       nodeSelector:
@@ -78,7 +78,6 @@ spec:
           volumeMounts:
       initContainers:
       volumes:
-  volumeClaimTemplates:
 ---
 # Source: component-chart/templates/deployment.yaml
 # Create headless service for StatefulSet

go.mod

@@ -31,7 +31,6 @@ require (
 	github.com/json-iterator/go v1.1.12
 	github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
 	github.com/loft-sh/go-github-selfupdate v1.0.0
-	github.com/loft-sh/loft-util v0.0.9-alpha
 	github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee
 	github.com/loft-sh/programming-language-detection v0.0.5
 	github.com/loft-sh/utils v0.0.16

go.sum

@@ -343,8 +343,6 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/loft-sh/go-github-selfupdate v1.0.0 h1:YS8iSsIWXw3BygBdPK2xDO4K84XYu2YuYgVS7eQNtik=
 github.com/loft-sh/go-github-selfupdate v1.0.0/go.mod h1:LDkR6J2QpqQLIMcYvNaSinVwvjPAkg8278oZBPGnrb8=
-github.com/loft-sh/loft-util v0.0.9-alpha h1:kGcyTQWxWHWy7bbjhS8Hsq/JRdlSztAU++anV6P+sqk=
-github.com/loft-sh/loft-util v0.0.9-alpha/go.mod h1:lsjG5Exh5iEf7Z/87nqwkxx3GRQTizFRLGuS1knF6Cg=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee h1:hZ79+pKEbCBrH1dVmgZ4jtFrrDPxgM4zqEP1lHlSnvI=
 github.com/loft-sh/notify v0.0.0-20210827094439-0720dcc7feee/go.mod h1:pq83B8lgfCY7tKdegTTXU6DZxGQkcWMowUTOTpTQmqk=
 github.com/loft-sh/programming-language-detection v0.0.5 h1:XiWlxtrf4t6Z7SQiob0JMKaCeMHCP3kWhB80wLt+EMY=

hack/build-all.bash

@@ -41,13 +41,32 @@ fi
 # Create the release directory
 mkdir -p "${DEVSPACE_ROOT}/release"
 
-# Install Helm 3
+# Install Helm 4
 echo "Installing helm"
-curl -s https://get.helm.sh/helm-v3.3.4-darwin-amd64.tar.gz > helm3.tar.gz && tar -zxvf helm3.tar.gz darwin-amd64/helm && chmod +x darwin-amd64/helm
+HELM_OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+HELM_ARCH=$(uname -m)
+case "${HELM_ARCH}" in
+  x86_64)
+    HELM_ARCH="amd64"
+    ;;
+  aarch64|arm64)
+    HELM_ARCH="arm64"
+    ;;
+  i386|i686)
+    HELM_ARCH="386"
+    ;;
+esac
+HELM_PLATFORM="${HELM_OS}-${HELM_ARCH}"
+HELM_VERSION=$(sed -nE 's/^const helmVersion = "([^"]+)"/\1/p' pkg/util/downloader/commands/helm_v4.go)
+if [[ -z "${HELM_VERSION}" ]]; then
+  echo "unable to determine Helm version" 1>&2
+  exit 1
+fi
+curl -s "https://get.helm.sh/helm-${HELM_VERSION}-${HELM_PLATFORM}.tar.gz" > helm4.tar.gz && tar -zxvf helm4.tar.gz "${HELM_PLATFORM}/helm" && chmod +x "${HELM_PLATFORM}/helm"
 
 # Pull the component chart
 COMPONENT_CHART_VERSION=$(cat pkg/devspace/deploy/deployer/helm/client.go | grep 'Version: "' | sed -nE 's/[^"]+"(.+)",\s*/\1/p')
-darwin-amd64/helm pull component-chart --repo https://charts.devspace.sh --version $COMPONENT_CHART_VERSION
+"${HELM_PLATFORM}/helm" pull component-chart --repo https://charts.devspace.sh --version $COMPONENT_CHART_VERSION
 
 # Move ui.tar.gz to releases
 echo "Moving ui"
@@ -74,28 +93,28 @@ for OS in ${DEVSPACE_BUILD_PLATFORMS[@]}; do
     if [[ "${OS}" == "windows" ]]; then
       NAME="${NAME}.exe"
     fi
-    
+
     # darwin 386 is deprecated and shouldn't be used anymore
     if [[ "${ARCH}" == "386" && "${OS}" == "darwin" ]]; then
         echo "Building for ${OS}/${ARCH} not supported."
         continue
     fi
-    
+
     # arm64 build is only supported for darwin
     if [[ "${ARCH}" == "arm64" && "${OS}" == "windows" ]]; then
         echo "Building for ${OS}/${ARCH} not supported."
         continue
     fi
-    
+
     echo "Building for ${OS}/${ARCH}"
-    
+
     # build darwin with CGO_ENABLED=1
     if [[ "${OS}" == "darwin" ]]; then
       CGO_ENABLED=1
     else
-      CGO_ENABLED=0 
+      CGO_ENABLED=0
     fi
-    
+
     # build the DevSpace binary
     CGO_ENABLED=${CGO_ENABLED} GOARCH=${ARCH} GOOS=${OS} ${GO_BUILD_CMD} -ldflags "${GO_BUILD_LDFLAGS}"\
                   -o "${DEVSPACE_ROOT}/release/${NAME}" .

pkg/devspace/config/loader/variable/predefined_variable.go

@@ -6,26 +6,25 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/context/values"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
-	"github.com/loft-sh/devspace/pkg/util/log"
-	"github.com/loft-sh/utils/pkg/downloader"
-	"github.com/loft-sh/utils/pkg/downloader/commands"
-	"github.com/sirupsen/logrus"
-
-	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
 	"github.com/loft-sh/devspace/pkg/util/git"
+	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/randutil"
+	"github.com/loft-sh/utils/pkg/downloader"
+	"github.com/loft-sh/utils/pkg/downloader/commands"
 	"github.com/mitchellh/go-homedir"
+	"github.com/sirupsen/logrus"
 )
 
 // PredefinedVariableOptions holds the options for a predefined variable to load
@@ -54,8 +53,8 @@ var predefinedVars = map[string]PredefinedVariableFunction{
 		}
 		return ex, nil
 	},
-	"DEVSPACE_KUBECTL_EXECUTABLE": func(ctx context.Context, options *PredefinedVariableOptions, log log.Logger) (interface{}, error) {
-		debugLog := log.WithLevel(logrus.DebugLevel)
+	"DEVSPACE_KUBECTL_EXECUTABLE": func(ctx context.Context, options *PredefinedVariableOptions, logger log.Logger) (interface{}, error) {
+		debugLog := logger.WithLevel(logrus.DebugLevel)
 		path, err := downloader.NewDownloader(commands.NewKubectlCommand(), debugLog, constants.DefaultHomeDevSpaceFolder).EnsureCommand(ctx)
 		if err != nil {
 			debugLog.Debugf("Error downloading kubectl: %v", err)

pkg/devspace/deploy/deployer/helm/client.go

@@ -23,7 +23,7 @@ const ComponentChartFolder = "component-chart"
 // DevSpaceChartConfig is the config that holds the devspace chart information
 var DevSpaceChartConfig = &latest.ChartConfig{
 	Name:    "component-chart",
-	Version: "0.9.1",
+	Version: "0.9.2",
 	RepoURL: "https://charts.devspace.sh",
 }
 

pkg/devspace/helm/client.go

@@ -2,11 +2,11 @@ package helm
 
 import (
 	"github.com/loft-sh/devspace/pkg/devspace/helm/types"
-	v3 "github.com/loft-sh/devspace/pkg/devspace/helm/v3"
+	v4 "github.com/loft-sh/devspace/pkg/devspace/helm/v4"
 	"github.com/loft-sh/devspace/pkg/util/log"
 )
 
 // NewClient creates a new helm client based on the config
 func NewClient(log log.Logger) (types.Client, error) {
-	return v3.NewClient(log)
+	return v4.NewClient(log)
 }