Skip to content

Commit 75f2ccb

Browse files
FabianKrammFabianKramm
committed
Fixed all compiler errors
1 parent a1d536d commit 75f2ccb

20 files changed

Lines changed: 557 additions & 351 deletions

File tree

‎cmd/add.go‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/covexo/devspace/pkg/devspace/config/v1"
1919
helmClient "github.com/covexo/devspace/pkg/devspace/helm"
2020
"github.com/covexo/devspace/pkg/devspace/kubectl"
21+
"github.com/covexo/devspace/pkg/devspace/services"
2122
"github.com/covexo/devspace/pkg/util/log"
2223
"github.com/russross/blackfriday"
2324
"github.com/skratchdot/open-golang/open"
@@ -167,7 +168,7 @@ func (cmd *AddCmd) RunAddPackage(cobraCmd *cobra.Command, args []string) {
167168
log.Fatalf("Unable to create new kubectl client: %v", err)
168169
}
169170

170-
helm, err := helmClient.NewClient(kubectl, false)
171+
helm, err := helmClient.NewClient(kubectl, log.GetInstance(), false)
171172
if err != nil {
172173
log.Fatalf("Error initializing helm client: %v", err)
173174
}
@@ -312,7 +313,7 @@ func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {
312313
config := configutil.GetConfig()
313314

314315
if cmd.syncFlags.Selector == "" {
315-
cmd.syncFlags.Selector = "release=" + getNameOfFirstHelmDeployment()
316+
cmd.syncFlags.Selector = "release=" + services.GetNameOfFirstHelmDeployment()
316317
}
317318

318319
labelSelectorMap, err := parseSelectors(cmd.syncFlags.Selector)
@@ -360,10 +361,8 @@ func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {
360361

361362
// RunAddPort executes the add port command logic
362363
func (cmd *AddCmd) RunAddPort(cobraCmd *cobra.Command, args []string) {
363-
config := configutil.GetConfig()
364-
365364
if cmd.portFlags.Selector == "" {
366-
cmd.portFlags.Selector = "release=" + getNameOfFirstHelmDeployment()
365+
cmd.portFlags.Selector = "release=" + services.GetNameOfFirstHelmDeployment()
367366
}
368367

369368
labelSelectorMap, err := parseSelectors(cmd.portFlags.Selector)
@@ -488,17 +487,3 @@ func parseSelectors(selectorString string) (map[string]*string, error) {
488487

489488
return selectorMap, nil
490489
}
491-
492-
func getNameOfFirstHelmDeployment() string {
493-
config := configutil.GetConfig()
494-
495-
if config.DevSpace.Deployments != nil {
496-
for _, deploymentConfig := range *config.DevSpace.Deployments {
497-
if deploymentConfig.Helm != nil && deploymentConfig.Namespace != nil {
498-
return *deploymentConfig.Namespace
499-
}
500-
}
501-
}
502-
503-
return DefaultDevspaceDeploymentName
504-
}

‎cmd/down.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,26 @@ func deleteDevSpace(kubectl *kubernetes.Clientset) {
5959

6060
if config.DevSpace.Deployments != nil {
6161
for _, deployConfig := range *config.DevSpace.Deployments {
62+
var err error
6263
var deployClient deploy.Interface
6364

6465
// Delete kubectl engine
6566
if deployConfig.Kubectl != nil {
66-
deployClient, err := deployKubectl.New(kubectl, deployConfig)
67+
deployClient, err = deployKubectl.New(kubectl, deployConfig, log.GetInstance())
6768
if err != nil {
6869
log.Warnf("Unable to create kubectl deploy config: %v", err)
6970
continue
7071
}
7172
} else {
72-
deployClient, err := deployHelm.New(kubectl, deployConfig)
73+
deployClient, err = deployHelm.New(kubectl, deployConfig, log.GetInstance())
7374
if err != nil {
7475
log.Warnf("Unable to create helm deploy config: %v", err)
7576
continue
7677
}
7778
}
7879

7980
log.StartWait("Deleting deployment %s" + *deployConfig.Name)
80-
err := deployClient.Delete(true)
81+
err = deployClient.Delete()
8182
log.StopWait()
8283
if err != nil {
8384
log.Warnf("Error deleting deployment %s: %v", *deployConfig.Name, err)

‎cmd/enter.go‎

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package cmd
22

33
import (
4-
"strings"
5-
6-
"github.com/covexo/devspace/pkg/devspace/config/configutil"
74
"github.com/covexo/devspace/pkg/devspace/kubectl"
5+
"github.com/covexo/devspace/pkg/devspace/services"
86
"github.com/covexo/devspace/pkg/util/log"
97
"github.com/spf13/cobra"
108
"k8s.io/client-go/kubernetes"
11-
kubectlExec "k8s.io/client-go/util/exec"
129
)
1310

1411
// EnterCmd is a struct that defines a command call for "enter"
@@ -58,64 +55,5 @@ func (cmd *EnterCmd) Run(cobraCmd *cobra.Command, args []string) {
5855
log.Fatalf("Unable to create new kubectl client: %v", err)
5956
}
6057

61-
enterTerminal(cmd.kubectl, cmd.flags.container, args)
62-
}
63-
64-
func enterTerminal(client *kubernetes.Clientset, containerNameOverride string, args []string) {
65-
var command []string
66-
config := configutil.GetConfig()
67-
68-
if len(args) == 0 && (config.DevSpace.Terminal.Command == nil || len(*config.DevSpace.Terminal.Command) == 0) {
69-
command = []string{
70-
"sh",
71-
"-c",
72-
"command -v bash >/dev/null 2>&1 && exec bash || exec sh",
73-
}
74-
} else {
75-
if len(args) > 0 {
76-
command = args
77-
} else {
78-
for _, cmd := range *config.DevSpace.Terminal.Command {
79-
command = append(command, *cmd)
80-
}
81-
}
82-
}
83-
84-
// Select pods
85-
namespace := ""
86-
if config.DevSpace.Terminal != nil && config.DevSpace.Terminal.Namespace != nil {
87-
namespace = *config.DevSpace.Terminal.Namespace
88-
}
89-
90-
// Retrieve pod from label selector
91-
labelSelector := "release=" + getNameOfFirstHelmDeployment()
92-
if config.DevSpace.Terminal != nil && config.DevSpace.Terminal.LabelSelector != nil {
93-
labels := make([]string, 0, len(*config.DevSpace.Terminal.LabelSelector))
94-
for key, value := range *config.DevSpace.Terminal.LabelSelector {
95-
labels = append(labels, key+"="+*value)
96-
}
97-
98-
labelSelector = strings.Join(labels, ", ")
99-
}
100-
101-
// Get first running pod
102-
pod, err := kubectl.GetFirstRunningPod(client, labelSelector, namespace)
103-
if err != nil {
104-
log.Fatalf("Cannot find running pod: %v", err)
105-
}
106-
107-
// Get container name
108-
containerName := pod.Spec.Containers[0].Name
109-
if containerNameOverride != "" {
110-
containerName = containerNameOverride
111-
} else if config.DevSpace.Terminal.ContainerName != nil {
112-
containerName = *config.DevSpace.Terminal.ContainerName
113-
}
114-
115-
_, _, _, terminalErr := kubectl.Exec(client, pod, containerName, command, true, nil)
116-
if terminalErr != nil {
117-
if _, ok := terminalErr.(kubectlExec.CodeExitError); ok == false {
118-
log.Fatalf("Unable to start terminal session: %v", terminalErr)
119-
}
120-
}
58+
services.StartTerminal(cmd.kubectl, cmd.flags.container, args)
12159
}

‎cmd/init.go‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ import (
2525
"github.com/spf13/cobra"
2626
)
2727

28-
// DefaultDevspaceDeploymentName is the name of the initial default deployment
29-
const DefaultDevspaceDeploymentName = "devspace-default"
30-
3128
// InitCmd is a struct that defines a command call for "init"
3229
type InitCmd struct {
3330
flags *InitCmdFlags
@@ -127,7 +124,7 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
127124
// Set intial deployments
128125
config.DevSpace.Deployments = &[]*v1.DeploymentConfig{
129126
{
130-
Name: configutil.String(DefaultDevspaceDeploymentName),
127+
Name: configutil.String(configutil.DefaultDevspaceDeploymentName),
131128
Namespace: configutil.String(""),
132129
Helm: &v1.HelmConfig{
133130
ChartPath: configutil.String("./chart"),
@@ -184,7 +181,12 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
184181
}
185182

186183
if cmd.flags.reconfigure || !configExists {
187-
cmd.configureKubernetes()
184+
// Check if devspace cloud should be used
185+
if cmd.useCloudProvider() == false {
186+
cmd.configureDevSpace()
187+
}
188+
189+
cmd.addDefaultSyncConfig()
188190
cmd.configureRegistry()
189191

190192
err := configutil.SaveConfig()
@@ -211,19 +213,6 @@ func (cmd *InitCmd) initChartGenerator() {
211213
}
212214
}
213215

214-
func (cmd *InitCmd) configureKubernetes() {
215-
config := configutil.GetConfig()
216-
clusterConfig := config.Cluster
217-
useKubeConfig := false
218-
219-
// Check if devspace cloud should be used
220-
if cmd.useCloudProvider() == false {
221-
cmd.configureDevSpace()
222-
}
223-
224-
cmd.addDefaultSyncConfig()
225-
}
226-
227216
func (cmd *InitCmd) useCloudProvider() bool {
228217
config := configutil.GetConfig()
229218
providerConfig, err := cloud.ParseCloudConfig()
@@ -345,7 +334,7 @@ func (cmd *InitCmd) addDefaultSyncConfig() {
345334
ContainerPath: configutil.String("/app"),
346335
LocalSubPath: configutil.String("./"),
347336
LabelSelector: &map[string]*string{
348-
"release": configutil.String(DefaultDevspaceDeploymentName),
337+
"release": configutil.String(configutil.DefaultDevspaceDeploymentName),
349338
},
350339
UploadExcludePaths: &uploadExcludePaths,
351340
})
@@ -354,7 +343,6 @@ func (cmd *InitCmd) addDefaultSyncConfig() {
354343
}
355344

356345
func (cmd *InitCmd) configureRegistry() {
357-
config := configutil.GetConfig()
358346
dockerUsername := ""
359347
createInternalRegistryDefaultAnswer := "yes"
360348

‎cmd/remove.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (cmd *RemoveCmd) rebuildDependencies(newYamlContents map[interface{}]interf
207207
log.Fatalf("Unable to create new kubectl client: %v", err)
208208
}
209209

210-
helm, err := helmClient.NewClient(kubectl, false)
210+
helm, err := helmClient.NewClient(kubectl, log.GetInstance(), false)
211211
if err != nil {
212212
log.Fatalf("Error initializing helm client: %v", err)
213213
}

‎cmd/reset.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020

2121
// ResetCmd holds the needed command information
2222
type ResetCmd struct {
23-
helm *helmClient.ClientWrapper
2423
kubectl *kubernetes.Clientset
2524
workdir string
2625
}
@@ -94,12 +93,12 @@ func (cmd *ResetCmd) deleteInternalRegistry() {
9493
return
9594
}
9695

97-
helm, err := helmClient.NewClient(cmd.kubectl, false)
96+
helm, err := helmClient.NewClient(cmd.kubectl, log.GetInstance(), false)
9897
if err != nil {
9998
log.Fatalf("Error creating helm client: %v", err)
10099
}
101100

102-
_, err = cmd.helm.DeleteRelease(registry.InternalRegistryName, true)
101+
_, err = helm.DeleteRelease(registry.InternalRegistryName, true)
103102
if err != nil {
104103
log.Failf("Error deleting internal registry: %v", err)
105104
} else {
@@ -199,8 +198,8 @@ func (cmd *ResetCmd) deleteImageFiles() {
199198
continue
200199
}
201200

202-
absDockerIgnorePath := ".dockerignore"
203-
_, err = os.Stat(absDockerfilePath)
201+
absDockerIgnorePath := filepath.Join(absContextPath, ".dockerignore")
202+
_, err = os.Stat(absDockerIgnorePath)
204203
if os.IsNotExist(err) == false {
205204
deleteDockerIgnore := *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
206205
Question: "Should " + absDockerIgnorePath + " be removed? (y/n)",

‎cmd/status.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
// StatusCmd holds the information needed for the status command
2020
type StatusCmd struct {
2121
flags *StatusCmdFlags
22-
helm *helmClient.ClientWrapper
2322
kubectl *kubernetes.Clientset
2423
workdir string
2524
}
@@ -97,6 +96,8 @@ func (cmd *StatusCmd) RunStatus(cobraCmd *cobra.Command, args []string) {
9796
log.PrintTable(headerValues, values)
9897
return
9998
}
99+
100+
values = append(values, tillerStatus)
100101
}
101102

102103
registryStatus, err := cmd.getRegistryStatus()
@@ -118,13 +119,13 @@ func (cmd *StatusCmd) RunStatus(cobraCmd *cobra.Command, args []string) {
118119

119120
// Delete kubectl engine
120121
if deployConfig.Kubectl != nil {
121-
deployClient, err := deployKubectl.New(cmd.kubectl, deployConfig)
122+
deployClient, err = deployKubectl.New(cmd.kubectl, deployConfig, log.GetInstance())
122123
if err != nil {
123124
log.Warnf("Unable to create kubectl deploy config for %s: %v", *deployConfig.Name, err)
124125
continue
125126
}
126127
} else {
127-
deployClient, err := deployHelm.New(cmd.kubectl, deployConfig)
128+
deployClient, err = deployHelm.New(cmd.kubectl, deployConfig, log.GetInstance())
128129
if err != nil {
129130
log.Warnf("Unable to create helm deploy config for %s: %v", *deployConfig.Name, err)
130131
continue
@@ -176,12 +177,12 @@ func (cmd *StatusCmd) getRegistryStatus() ([]string, error) {
176177
return nil, nil
177178
}
178179

179-
helm, err := helmClient.NewClient(cmd.kubectl, false)
180+
helm, err := helmClient.NewClient(cmd.kubectl, log.GetInstance(), false)
180181
if err != nil {
181182
return nil, err
182183
}
183184

184-
releases, err := cmd.helm.Client.ListReleases()
185+
releases, err := helm.Client.ListReleases()
185186
if err != nil {
186187
return nil, err
187188
}

0 commit comments

Comments
 (0)