Skip to content

Commit 900167b

Browse files
committed
Don't add special config for minikube
1 parent ccfe4e1 commit 900167b

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

cmd/init.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/devspace-cloud/devspace/pkg/devspace/configure"
1919
"github.com/devspace-cloud/devspace/pkg/devspace/generator"
2020
"github.com/devspace-cloud/devspace/pkg/util/fsutil"
21-
"github.com/devspace-cloud/devspace/pkg/util/kubeconfig"
2221
"github.com/devspace-cloud/devspace/pkg/util/log"
2322
"github.com/devspace-cloud/devspace/pkg/util/ptr"
2423
"github.com/devspace-cloud/devspace/pkg/util/survey"
@@ -420,18 +419,12 @@ func getDeploymentName() (string, error) {
420419
}
421420

422421
func (cmd *InitCmd) configureCluster() {
423-
currentContext, err := kubeconfig.GetCurrentContext()
424-
if err != nil {
425-
log.Fatalf("Couldn't determine current kubernetes context: %v", err)
426-
}
427-
428422
namespace := survey.Question(&survey.QuestionOptions{
429423
Question: "Which namespace should the app run in?",
430424
DefaultValue: "default",
431425
})
432426

433427
config := configutil.GetConfig()
434-
config.Cluster.KubeContext = &currentContext
435428
config.Cluster.Namespace = &namespace
436429
}
437430

pkg/devspace/configure/image.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/devspace-cloud/devspace/pkg/devspace/config/versions/latest"
1414
v1 "github.com/devspace-cloud/devspace/pkg/devspace/config/versions/latest"
1515
"github.com/devspace-cloud/devspace/pkg/devspace/docker"
16-
"github.com/devspace-cloud/devspace/pkg/devspace/kubectl/minikube"
1716
"github.com/devspace-cloud/devspace/pkg/util/log"
1817
"github.com/devspace-cloud/devspace/pkg/util/ptr"
1918
"github.com/devspace-cloud/devspace/pkg/util/survey"
@@ -102,23 +101,6 @@ func GetImageConfigFromDockerfile(config *latest.Config, dockerfile, context str
102101
if err == nil {
103102
dockerUsername = dockerAuthConfig.Username
104103
}
105-
106-
// Don't push image in minikube
107-
if minikube.IsMinikube(config) {
108-
retImageConfig.Image = ptr.String("devspace")
109-
if retImageConfig.Build != nil && retImageConfig.Build.Kaniko != nil {
110-
retImageConfig.Build.Kaniko = nil
111-
}
112-
if retImageConfig.Build == nil {
113-
retImageConfig.Build = &latest.BuildConfig{}
114-
}
115-
if retImageConfig.Build.Docker == nil {
116-
retImageConfig.Build.Docker = &latest.DockerConfig{}
117-
}
118-
119-
retImageConfig.Build.Docker.SkipPush = ptr.Bool(true)
120-
return retImageConfig, nil
121-
}
122104
}
123105

124106
// Check which registry to use

0 commit comments

Comments
 (0)