Merge branch 'master' of https://github.com/devspace-cloud/devspace

Author: FabianKramm

PULL_REQUEST_TEMPLATE.md

@@ -9,10 +9,8 @@
 resolves #
 
 
-**Does this pull request has user-facing changes?** (e.g. config changes, new/modified commands, new/modified flags) 
-
-
-**Does this pull request add new dependencies?** 
+**Please provide a short message that should be published in the DevSpace release notes**
+Fixed an issue where DevSpace ...
 
 
 **What else do we need to know?** 

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/websocket v1.4.2
-	github.com/hashicorp/go-version v1.2.0
+	github.com/hashicorp/go-version v1.3.0
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
 	github.com/joho/godotenv v1.3.0
 	github.com/json-iterator/go v1.1.11

go.sum

@@ -614,8 +614,9 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw=
+github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

pkg/devspace/deploy/deployer/kubectl/builder.go

@@ -7,7 +7,9 @@ import (
 	"strings"
 
 	"github.com/ghodss/yaml"
+	version "github.com/hashicorp/go-version"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
+	"github.com/loft-sh/devspace/pkg/util/command"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -72,6 +74,33 @@ func NewKubectlBuilder(path string, config *latest.DeploymentConfig, context, na
 	}
 }
 
+// this function is called in Build function
+// to decide the --dry-run value
+var useOldDryRun = func(path string) (bool, error) {
+	// compare kubectl version for --dry-run flag value
+	out, err := command.NewStreamCommand(path, []string{"version", "--client", "--short"}).Output()
+	if err != nil {
+		return false, err
+	}
+
+	v1, err := version.NewVersion(strings.TrimPrefix(strings.TrimSpace(string(out)), "Client Version: v"))
+	if err != nil {
+
+		return false, err
+	}
+
+	v2, err := version.NewVersion("1.18.0")
+	if err != nil {
+		return false, err
+	}
+
+	if v1.LessThan(v2) {
+		return true, nil
+	}
+
+	return false, nil
+}
+
 func (k *kubectlBuilder) Build(manifest string, cmd RunCommand) ([]*unstructured.Unstructured, error) {
 	args := []string{"create"}
 	if k.context != "" && !k.isInCluster {
@@ -81,7 +110,18 @@ func (k *kubectlBuilder) Build(manifest string, cmd RunCommand) ([]*unstructured
 		args = append(args, "--namespace", k.namespace)
 	}
 
-	args = append(args, "--dry-run", "--output", "yaml", "--validate=false")
+	// decides which --dry-run value is to be used
+	uodr, err := useOldDryRun(k.path)
+	if err != nil {
+		return nil, err
+	}
+
+	if uodr {
+		args = append(args, "--dry-run", "--output", "yaml", "--validate=false")
+	} else {
+		args = append(args, "--dry-run=client", "--output", "yaml", "--validate=false")
+	}
+
 	if k.config.Kubectl.Kustomize != nil && *k.config.Kubectl.Kustomize {
 		args = append(args, "--kustomize", manifest)
 	} else {

pkg/devspace/deploy/deployer/kubectl/kubectl_test.go

@@ -192,6 +192,10 @@ func TestRender(t *testing.T) {
 			},
 		}
 
+		useOldDryRun = func(path string) (bool, error) {
+			return true, nil
+		}
+
 		reader, writer := io.Pipe()
 		defer reader.Close()
 
@@ -318,6 +322,9 @@ func TestDelete(t *testing.T) {
 			}
 		}
 
+		useOldDryRun = func(path string) (bool, error) {
+			return true, nil
+		}
 		err := deployer.Delete()
 		if testCase.expectedErr == "" {
 			assert.NilError(t, err, "Error in testCase %s", testCase.name)
@@ -402,6 +409,9 @@ func TestDeploy(t *testing.T) {
 			}
 		}
 
+		useOldDryRun = func(path string) (bool, error) {
+			return true, nil
+		}
 		deployed, err := deployer.Deploy(testCase.forceDeploy, testCase.builtImages)
 
 		if testCase.expectedErr == "" {
@@ -479,7 +489,9 @@ func TestGetReplacedManifest(t *testing.T) {
 				Images: testCase.imageConfigs,
 			}, cache, nil, constants.DefaultConfigPath),
 		}
-
+		useOldDryRun = func(path string) (bool, error) {
+			return true, nil
+		}
 		shouldRedeploy, replacedManifest, err := deployer.getReplacedManifest(testCase.manifest, testCase.builtImages)
 
 		if testCase.expectedErr == "" {

pkg/util/downloader/commands/kubectl.go

@@ -1,18 +1,16 @@
 package commands
 
 import (
-	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
-	"github.com/loft-sh/devspace/pkg/util/command"
-	"github.com/mitchellh/go-homedir"
-	"github.com/otiai10/copy"
+	"io/ioutil"
+	"net/http"
 	"path/filepath"
 	"runtime"
 	"strings"
-)
 
-var (
-	kubectlVersion  = "v1.21.2"
-	kubectlDownload = "https://storage.googleapis.com/kubernetes-release/release/" + kubectlVersion + "/bin/" + runtime.GOOS + "/" + runtime.GOARCH + "/kubectl"
+	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
+	"github.com/loft-sh/devspace/pkg/util/command"
+	"github.com/mitchellh/go-homedir"
+	"github.com/otiai10/copy"
 )
 
 func NewKubectlCommand() Command {
@@ -40,7 +38,21 @@ func (k *kubectlCommand) InstallPath() (string, error) {
 }
 
 func (k *kubectlCommand) DownloadURL() string {
-	url := kubectlDownload
+	// let the default kubectl version be 1.22.0
+	kubectlVersion := "v1.22.0"
+
+	// try to fetch latest kubectl version if it fails use default version
+	res, err := http.Get("https://storage.googleapis.com/kubernetes-release/release/stable.txt")
+	if err == nil {
+		content, err := ioutil.ReadAll(res.Body)
+		res.Body.Close()
+		if err == nil {
+			kubectlVersion = string(content)
+		}
+	}
+
+	url := "https://storage.googleapis.com/kubernetes-release/release/" + kubectlVersion + "/bin/" + runtime.GOOS + "/" + runtime.GOARCH + "/kubectl"
+
 	if runtime.GOOS == "windows" {
 		url += ".exe"
 	}

pkg/util/downloader/downloader.go

@@ -1,13 +1,14 @@
 package downloader
 
 import (
-	"github.com/loft-sh/devspace/pkg/util/downloader/commands"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
 
+	"github.com/loft-sh/devspace/pkg/util/downloader/commands"
+
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/pkg/errors"
 )