Skip to content

Commit

Permalink
do a shallow clone by default (devspace-sh#1033) & remove predefined …
Browse files Browse the repository at this point in the history
…components
  • Loading branch information
FabianKramm committed Mar 27, 2020
1 parent e73da79 commit 0b5c60d
Show file tree
Hide file tree
Showing 20 changed files with 334 additions and 922 deletions.
2 changes: 0 additions & 2 deletions cmd/add/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ func (cmd *deploymentCmd) RunAddDeployment(f factory.Factory, cobraCmd *cobra.Co
newImage, newDeployment, err = configureManager.NewDockerfileComponentDeployment(generatedConfig, deploymentName, cmd.Image, cmd.Dockerfile, cmd.Context)
} else if cmd.Image != "" {
newImage, newDeployment, err = configureManager.NewImageComponentDeployment(deploymentName, cmd.Image)
} else if cmd.Component != "" {
newDeployment, err = configureManager.NewPredefinedComponentDeployment(deploymentName, cmd.Component)
} else {
return errors.New("Please specifiy one of these parameters:\n--image: A docker image to deploy (e.g. dscr.io/myuser/myrepo or dockeruser/repo:0.1 or mysql:latest)\n--manifests: The kubernetes manifests to deploy (glob pattern are allowed, comma separated, e.g. manifests/** or kube/pod.yaml)\n--chart: A helm chart to deploy (e.g. ./chart or stable/mysql)\n--component: A predefined component to use (run `devspace list available-components` to see all available components)")
}
Expand Down
59 changes: 0 additions & 59 deletions cmd/list/available_components.go

This file was deleted.

100 changes: 0 additions & 100 deletions cmd/list/available_components_test.go

This file was deleted.

1 change: 0 additions & 1 deletion cmd/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func NewListCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Comman
listCmd.AddCommand(newVarsCmd(f, globalFlags))
listCmd.AddCommand(newDeploymentsCmd(f, globalFlags))
listCmd.AddCommand(newProvidersCmd(f))
listCmd.AddCommand(newAvailableComponentsCmd(f))
listCmd.AddCommand(newContextsCmd(f))
listCmd.AddCommand(newCommandsCmd(f, globalFlags))
listCmd.AddCommand(newNamespacesCmd(f, globalFlags))
Expand Down
2 changes: 1 addition & 1 deletion examples/dependencies/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ dependencies:
- source:
path: dependency2
- source:
git: https://github.com/devspace-cloud/example-dependency.git
git: https://github.com/devspace-cloud/example-dependency.git
6 changes: 3 additions & 3 deletions examples/quickstart/devspace.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
version: v1beta7
version: v1beta8
images:
default:
image: dscr.io/${DEVSPACE_USERNAME}/devspace
image: myusername/devspace
deployments:
- name: quickstart
helm:
componentChart: true
values:
containers:
- image: dscr.io/${DEVSPACE_USERNAME}/devspace
- image: myusername/devspace
service:
ports:
- port: 3000
Expand Down
17 changes: 0 additions & 17 deletions pkg/devspace/chart/component.go

This file was deleted.

61 changes: 0 additions & 61 deletions pkg/devspace/chart/component_test.go

This file was deleted.

3 changes: 1 addition & 2 deletions pkg/devspace/config/loader/predefined_vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ var predefinedVars = map[string]func(loader *configLoader) (string, error){
return strconv.FormatInt(time.Now().Unix(), 10), nil
},
"DEVSPACE_GIT_COMMIT": func(loader *configLoader) (string, error) {
gitRepo := git.NewGitRepository(filepath.Dir(loader.ConfigPath()), "")
hash, err := gitRepo.GetHash()
hash, err := git.GetHash(filepath.Dir(loader.ConfigPath()))
if err != nil {
return "", fmt.Errorf("No git repository found (%v), but predefined var DEVSPACE_GIT_COMMIT is used", err)
}
Expand Down
13 changes: 7 additions & 6 deletions pkg/devspace/config/versions/latest/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,13 @@ type DependencyConfig struct {

// SourceConfig defines the dependency source
type SourceConfig struct {
Git string `yaml:"git,omitempty"`
CloneArgs []string `yaml:"cloneArgs,omitempty"`
SubPath string `yaml:"subPath,omitempty"`
Branch string `yaml:"branch,omitempty"`
Tag string `yaml:"tag,omitempty"`
Revision string `yaml:"revision,omitempty"`
Git string `yaml:"git,omitempty"`
CloneArgs []string `yaml:"cloneArgs,omitempty"`
DisableShallow bool `yaml:"disableShallow,omitempty"`
SubPath string `yaml:"subPath,omitempty"`
Branch string `yaml:"branch,omitempty"`
Tag string `yaml:"tag,omitempty"`
Revision string `yaml:"revision,omitempty"`

Path string `yaml:"path,omitempty"`
}
Expand Down
18 changes: 0 additions & 18 deletions pkg/devspace/configure/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/devspace-cloud/devspace/pkg/devspace/config/generated"
"github.com/devspace-cloud/devspace/pkg/devspace/config/versions/latest"
v1 "github.com/devspace-cloud/devspace/pkg/devspace/config/versions/latest"
"github.com/devspace-cloud/devspace/pkg/devspace/generator"
dockerfileutil "github.com/devspace-cloud/devspace/pkg/util/dockerfile"
"github.com/devspace-cloud/devspace/pkg/util/ptr"
"github.com/devspace-cloud/devspace/pkg/util/survey"
Expand Down Expand Up @@ -134,23 +133,6 @@ func (m *manager) NewImageComponentDeployment(name, imageName string) (*latest.I
return retImageConfig, retDeploymentConfig, nil
}

// NewPredefinedComponentDeployment creates a deployment that uses a predefined component
func (m *manager) NewPredefinedComponentDeployment(name, component string) (*latest.DeploymentConfig, error) {
// Create component generator
componentGenerator, err := generator.NewComponentGenerator()
if err != nil {
return nil, errors.Errorf("Error initializing component generator: %v", err)
}

// Get component template
componentTemplate, err := componentGenerator.GetComponentTemplate(component, m.log)
if err != nil {
return nil, errors.Errorf("Error retrieving template: %v", err)
}

return generateComponentDeployment(name, componentTemplate)
}

func generateComponentDeployment(name string, componentConfig *latest.ComponentConfig) (*latest.DeploymentConfig, error) {
chartValues, err := yamlutil.ToInterfaceMap(componentConfig)
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion pkg/devspace/configure/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
type Manager interface {
NewDockerfileComponentDeployment(generatedConfig *generated.Config, name, imageName, dockerfile, context string) (*latest.ImageConfig, *latest.DeploymentConfig, error)
NewImageComponentDeployment(name, imageName string) (*latest.ImageConfig, *latest.DeploymentConfig, error)
NewPredefinedComponentDeployment(name, component string) (*latest.DeploymentConfig, error)
NewKubectlDeployment(name, manifests string) (*latest.DeploymentConfig, error)
NewHelmDeployment(name, chartName, chartRepo, chartVersion string) (*latest.DeploymentConfig, error)
RemoveDeployment(removeAll bool, name string) (bool, error)
Expand Down

0 comments on commit 0b5c60d

Please sign in to comment.