Merge pull request #1448 from dgageot/fix-1447

Support new K8s context name in Docker Desktop
GoogleContainerTools · Jan 11, 2019 · 17fefe2 · 17fefe2
2 parents a436989 + 2952800
commit 17fefe2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/skaffold/build/local/types.go b/pkg/skaffold/build/local/types.go
@@ -46,7 +46,8 @@ func NewBuilder(cfg *latest.LocalBuild, kubeContext string) (*Builder, error) {
 		return nil, errors.Wrap(err, "getting docker client")
 	}
 
-	localCluster := kubeContext == constants.DefaultMinikubeContext || kubeContext == constants.DefaultDockerForDesktopContext
+	localCluster := isLocal(kubeContext)
+
 	var pushImages bool
 	if cfg.Push == nil {
 		pushImages = !localCluster
@@ -64,6 +65,12 @@ func NewBuilder(cfg *latest.LocalBuild, kubeContext string) (*Builder, error) {
 	}, nil
 }
 
+func isLocal(kubeContext string) bool {
+	return kubeContext == constants.DefaultMinikubeContext ||
+		kubeContext == constants.DefaultDockerForDesktopContext ||
+		kubeContext == constants.DefaultDockerDesktopContext
+}
+
 // Labels are labels specific to local builder.
 func (b *Builder) Labels() map[string]string {
 	labels := map[string]string{

diff --git a/pkg/skaffold/constants/constants.go b/pkg/skaffold/constants/constants.go
@@ -40,6 +40,7 @@ const (
 
 	DefaultMinikubeContext         = "minikube"
 	DefaultDockerForDesktopContext = "docker-for-desktop"
+	DefaultDockerDesktopContext    = "docker-desktop"
 	GCSBucketSuffix                = "_cloudbuild"
 
 	HelmOverridesFilename = "skaffold-overrides.yaml"