Skip to content

resolve #315 #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FabianKramm merged 1 commit into from
Oct 26, 2018
Merged

resolve #315 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ func (cmd *InitCmd) initChartGenerator() {

func (cmd *InitCmd) useCloudProvider() bool {
config := configutil.GetConfig()
overwriteConfig := configutil.GetOverwriteConfig()
providerConfig, err := cloud.ParseCloudConfig()
if err != nil {
log.Fatalf("Error loading cloud config: %v", err)
Expand Down Expand Up @@ -256,7 +257,7 @@ func (cmd *InitCmd) useCloudProvider() bool {
config.Cluster.CloudProvider = &cloudProviderSelected

log.StartWait("Logging into cloud provider " + providerConfig[cloudProviderSelected].Host + cloud.LoginEndpoint + "...")
err := cloud.Update(providerConfig, config, addToContext, true)
err := cloud.Update(providerConfig, *config.Cluster.CloudProvider, overwriteConfig, addToContext, true)
log.StopWait()
if err != nil {
log.Fatalf("Couldn't authenticate to DevSpace Cloud: %v", err)
Expand All @@ -281,7 +282,7 @@ func (cmd *InitCmd) useCloudProvider() bool {
config.Cluster.CloudProvider = configutil.String(cloud.DevSpaceCloudProviderName)

log.StartWait("Logging into cloud provider " + providerConfig[cloud.DevSpaceCloudProviderName].Host + cloud.LoginEndpoint + "...")
err := cloud.Update(providerConfig, config, addToContext, true)
err := cloud.Update(providerConfig, *config.Cluster.CloudProvider, overwriteConfig, addToContext, true)
log.StopWait()
if err != nil {
log.Fatalf("Couldn't authenticate to DevSpace Cloud: %v", err)
Expand Down
4 changes: 1 addition & 3 deletions pkg/devspace/cloud/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,7 @@ func Login(provider *Provider) (string, *api.Cluster, *api.AuthInfo, error) {
}

// Update updates the cloud provider information if necessary
func Update(providerConfig ProviderConfig, dsConfig *v1.Config, useKubeContext, switchKubeContext bool) error {
cloudProvider := *dsConfig.Cluster.CloudProvider

func Update(providerConfig ProviderConfig, cloudProvider string, dsConfig *v1.Config, useKubeContext, switchKubeContext bool) error {
// Don't update anything if we don't use a cloud provider
if cloudProvider == "" {
return nil
Expand Down
14 changes: 5 additions & 9 deletions pkg/devspace/config/configutil/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,7 @@ func SetDefaultsOnce() {
}

if deployConfig.Namespace == nil {
defaultDeployments := *defaultConfig.DevSpace.Deployments
defaultValue := String("")

defaultDeployments = append(defaultDeployments, &v1.DeploymentConfig{
Namespace: defaultValue,
})
defaultConfig.DevSpace.Deployments = &defaultDeployments
deployConfig.Namespace = defaultValue
deployConfig.Namespace = String("")
}

if deployConfig.Helm != nil {
Expand All @@ -157,9 +150,11 @@ func SetDefaultsOnce() {
}

if needTiller && config.Tiller == nil {
config.Tiller = &v1.TillerConfig{
defaultConfig.Tiller = &v1.TillerConfig{
Namespace: &defaultNamespace,
}

config.Tiller = defaultConfig.Tiller
}
}

Expand All @@ -174,6 +169,7 @@ func SetDefaultsOnce() {
}

if config.InternalRegistry != nil {
defaultConfig.InternalRegistry.Namespace = &defaultNamespace
config.InternalRegistry.Namespace = &defaultNamespace
}
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/kubectl/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func loadCloudConfig(config *v1.Config, log log.Logger) error {
}

log.StartWait("Login to cloud provider")
err = cloud.Update(providerConfig, config, config.Cluster.APIServer == nil, false)
err = cloud.Update(providerConfig, *config.Cluster.CloudProvider, config, config.Cluster.APIServer == nil, false)
log.StopWait()
if err != nil {
log.Warnf("Couldn't update cloud provider %s information: %v", *config.Cluster.CloudProvider, err)
Expand Down