Skip to content

Refactor config #285

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 15 commits into from
Oct 12, 2018
Merged

Refactor config #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8adc2b2
Refactoring config & prepare kubectl deployment
FabianKramm Oct 11, 2018
38cd123
Refactor config package
FabianKramm Oct 11, 2018
fc5d176
Config refactoring continued
FabianKramm Oct 11, 2018
adc9e06
Config improvements
FabianKramm Oct 11, 2018
39d9b88
Merge branch 'master' into refactor-config
FabianKramm Oct 11, 2018
f4434ef
Refactor config
FabianKramm Oct 12, 2018
923cd44
Exchange registry urls
FabianKramm Oct 12, 2018
99b8285
Refactor tillernamespace
FabianKramm Oct 12, 2018
1c6d92c
Fix init issues
FabianKramm Oct 12, 2018
5e72ee2
Fix several issues during build
FabianKramm Oct 12, 2018
9a5d9c0
Fix internal registry issues
FabianKramm Oct 12, 2018
aae00f7
Fix issue with creating internal registry namespace
FabianKramm Oct 12, 2018
c49d90c
Use kaniko as default if docker is not installed
FabianKramm Oct 12, 2018
de39a20
Fix potential problem where a terminal to a wrong pod was opened
FabianKramm Oct 12, 2018
e43d191
Prettify status sync
FabianKramm Oct 12, 2018
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
14 changes: 7 additions & 7 deletions cmd/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"github.com/covexo/devspace/pkg/util/tar"
"github.com/covexo/devspace/pkg/util/yamlutil"

helmClient "github.com/covexo/devspace/pkg/devspace/clients/helm"
"github.com/covexo/devspace/pkg/devspace/clients/kubectl"
"github.com/covexo/devspace/pkg/devspace/config/configutil"
"github.com/covexo/devspace/pkg/devspace/config/v1"
helmClient "github.com/covexo/devspace/pkg/devspace/deploy/helm"
"github.com/covexo/devspace/pkg/devspace/kubectl"
"github.com/covexo/devspace/pkg/util/log"
"github.com/russross/blackfriday"
"github.com/skratchdot/open-golang/open"
Expand Down Expand Up @@ -309,7 +309,7 @@ func (cmd *AddCmd) showReadme(chartVersion *repo.ChartVersion) {

// RunAddSync executes the add sync command logic
func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {
config := configutil.GetConfig(false)
config := configutil.GetConfig()

if cmd.syncFlags.Selector == "" {
cmd.syncFlags.Selector = "release=" + *config.DevSpace.Release.Name
Expand Down Expand Up @@ -345,7 +345,7 @@ func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {
}

syncConfig := append(*config.DevSpace.Sync, &v1.SyncConfig{
ResourceType: configutil.String(cmd.syncFlags.ResourceType),
ResourceType: nil,
LabelSelector: &labelSelectorMap,
ContainerPath: configutil.String(cmd.syncFlags.ContainerPath),
LocalSubPath: configutil.String(cmd.syncFlags.LocalPath),
Expand All @@ -362,7 +362,7 @@ func (cmd *AddCmd) RunAddSync(cobraCmd *cobra.Command, args []string) {

// RunAddPort executes the add port command logic
func (cmd *AddCmd) RunAddPort(cobraCmd *cobra.Command, args []string) {
config := configutil.GetConfig(false)
config := configutil.GetConfig()

if cmd.portFlags.Selector == "" {
cmd.portFlags.Selector = "release=" + *config.DevSpace.Release.Name
Expand Down Expand Up @@ -390,7 +390,7 @@ func (cmd *AddCmd) RunAddPort(cobraCmd *cobra.Command, args []string) {
}

func (cmd *AddCmd) insertOrReplacePortMapping(labelSelectorMap map[string]*string, portMappings []*v1.PortMapping) {
config := configutil.GetConfig(false)
config := configutil.GetConfig()

// Check if we should add to existing port mapping
for _, v := range *config.DevSpace.PortForwarding {
Expand All @@ -411,7 +411,7 @@ func (cmd *AddCmd) insertOrReplacePortMapping(labelSelectorMap map[string]*strin
}
}
portMap := append(*config.DevSpace.PortForwarding, &v1.PortForwardingConfig{
ResourceType: configutil.String(cmd.portFlags.ResourceType),
ResourceType: nil,
LabelSelector: &labelSelectorMap,
PortMappings: &portMappings,
})
Expand Down
7 changes: 3 additions & 4 deletions cmd/down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
helmClient "github.com/covexo/devspace/pkg/devspace/clients/helm"
"github.com/covexo/devspace/pkg/devspace/clients/kubectl"
"github.com/covexo/devspace/pkg/devspace/config/configutil"
helmClient "github.com/covexo/devspace/pkg/devspace/deploy/helm"
"github.com/covexo/devspace/pkg/devspace/kubectl"
"github.com/covexo/devspace/pkg/util/log"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -43,8 +43,7 @@ your project, use: devspace reset
// Run executes the down command logic
func (cmd *DownCmd) Run(cobraCmd *cobra.Command, args []string) {
log.StartFileLogging()

config := configutil.GetConfig(false)
config := configutil.GetConfig()

releaseName := *config.DevSpace.Release.Name
kubectl, err := kubectl.NewClient()
Expand Down
8 changes: 4 additions & 4 deletions cmd/enter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
helmClient "github.com/covexo/devspace/pkg/devspace/clients/helm"
"github.com/covexo/devspace/pkg/devspace/clients/kubectl"
"github.com/covexo/devspace/pkg/devspace/config/configutil"
helmClient "github.com/covexo/devspace/pkg/devspace/deploy/helm"
"github.com/covexo/devspace/pkg/devspace/kubectl"
"github.com/covexo/devspace/pkg/util/log"
"github.com/spf13/cobra"
k8sv1 "k8s.io/api/core/v1"
Expand All @@ -14,7 +14,7 @@ import (
// EnterCmd is a struct that defines a command call for "enter"
type EnterCmd struct {
flags *EnterCmdFlags
helm *helmClient.HelmClientWrapper
helm *helmClient.ClientWrapper
kubectl *kubernetes.Clientset
pod *k8sv1.Pod
}
Expand Down Expand Up @@ -80,7 +80,7 @@ func (cmd *EnterCmd) Run(cobraCmd *cobra.Command, args []string) {

func enterTerminal(client *kubernetes.Clientset, pod *k8sv1.Pod, containerNameOverride string, args []string) {
var command []string
config := configutil.GetConfig(false)
config := configutil.GetConfig()

if len(args) == 0 && (config.DevSpace.Terminal.Command == nil || len(*config.DevSpace.Terminal.Command) == 0) {
command = []string{
Expand Down
Loading