Skip to content

Commit 9605c50

Browse files
committed
Rename package
1 parent 4793190 commit 9605c50

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

cmd/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"k8s.io/client-go/tools/clientcmd"
1515

1616
"github.com/covexo/devspace/pkg/devspace/clients/kubectl"
17-
"github.com/covexo/devspace/pkg/devspace/login"
17+
"github.com/covexo/devspace/pkg/devspace/cloud"
1818

1919
"github.com/covexo/devspace/pkg/devspace/builder/docker"
2020

@@ -369,7 +369,7 @@ func (cmd *InitCmd) useDevSpaceCloud() bool {
369369
cmd.config.Cluster.DevSpaceCloud = &useDevSpaceCloud
370370
cmd.config.Cluster.UseKubeConfig = &addToContext
371371

372-
err := login.Update(cmd.config, true)
372+
err := cloud.Update(cmd.config, true)
373373
if err != nil {
374374
log.Fatalf("Couldn't authenticate to devspace cloud: %v", err)
375375
}

cmd/up.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/covexo/devspace/pkg/devspace/login"
13-
1412
"github.com/covexo/devspace/pkg/util/hash"
1513
"github.com/covexo/devspace/pkg/util/stdinutil"
1614

@@ -137,15 +135,6 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
137135
initCmd.Run(nil, []string{})
138136
}
139137

140-
// Load config
141-
config := configutil.GetConfig(false)
142-
if config.Cluster.DevSpaceCloud != nil && *config.Cluster.DevSpaceCloud {
143-
err = login.Update(config, false)
144-
if err != nil {
145-
log.Warnf("Couldn't update devspace cloud cluster information: %v", err)
146-
}
147-
}
148-
149138
cmd.kubectl, err = kubectl.NewClient()
150139
if err != nil {
151140
log.Fatalf("Unable to create new kubectl client: %v", err)
@@ -176,6 +165,9 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
176165
log.Fatalf("Error hashing chart directory: %v", err)
177166
}
178167

168+
// Load config
169+
config := configutil.GetConfig(false)
170+
179171
pod, err := getRunningDevSpacePod(cmd.helm, cmd.kubectl)
180172
if err != nil || mustRedeploy || cmd.flags.deploy || config.DevSpace.ChartHash == nil || *config.DevSpace.ChartHash != hash {
181173
cmd.deployChart()

pkg/devspace/clients/kubectl/client.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/covexo/devspace/pkg/util/kubeconfig"
1313

14+
"github.com/covexo/devspace/pkg/devspace/cloud"
1415
"github.com/covexo/devspace/pkg/devspace/config/configutil"
1516
"github.com/covexo/devspace/pkg/util/log"
1617
dockerterm "github.com/docker/docker/pkg/term"
@@ -36,7 +37,6 @@ var isMinikubeVar *bool
3637
//NewClient creates a new kubernetes client
3738
func NewClient() (*kubernetes.Clientset, error) {
3839
config, err := GetClientConfig()
39-
4040
if err != nil {
4141
return nil, err
4242
}
@@ -51,6 +51,14 @@ func GetClientConfig() (*rest.Config, error) {
5151
return nil, errors.New("Couldn't load cluster config, did you run devspace init")
5252
}
5353

54+
// Update devspace cloud cluster config
55+
if config.Cluster.DevSpaceCloud != nil && *config.Cluster.DevSpaceCloud {
56+
err := cloud.Update(config, false)
57+
if err != nil {
58+
log.Warnf("Couldn't update devspace cloud cluster information: %v", err)
59+
}
60+
}
61+
5462
if (config.Cluster.UseKubeConfig != nil && *config.Cluster.UseKubeConfig) || config.Cluster.APIServer == nil {
5563
// If we should use a certain kube context use that
5664
if config.Cluster.KubeContext != nil && len(*config.Cluster.KubeContext) > 0 {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package login
1+
package cloud
22

33
import (
44
"encoding/json"

0 commit comments

Comments
 (0)