refactor: config changes

Author: FabianKramm

cmd/init.go

@@ -671,7 +671,7 @@ func (cmd *InitCmd) addProfileConfig(config *latest.Config, imageName string) er
 			}
 
 			// If image building is disabled, move it to production profile instead of disabling it
-			if imageConfig.Build != nil && imageConfig.Build.Disabled {
+			if imageConfig.Build != nil {
 				imageConfig.AppendDockerfileInstructions = []string{}
 				imageConfig.InjectRestartHelper = false
 				imageConfig.RebuildStrategy = latest.RebuildStrategyDefault
@@ -681,7 +681,6 @@ func (cmd *InitCmd) addProfileConfig(config *latest.Config, imageName string) er
 					imageConfig.Build.Docker.Options.Target = ""
 				}
 
-				imageConfig.Build.Disabled = false
 				if imageConfig.Build.Docker == nil && imageConfig.Build.BuildKit == nil && imageConfig.Build.Kaniko == nil {
 					imageConfig.Build = nil
 				}

pkg/devspace/build/build.go

@@ -70,13 +70,11 @@ func (c *controller) Build(ctx *devspacecontext.Context, images []string, option
 	if !options.Sequential {
 		// check if all images are disabled besides one
 		imagesToBuild := 0
-		for k, image := range conf.Images {
+		for k := range conf.Images {
 			if len(images) > 0 && !stringutil.Contains(images, k) {
 				continue
 			}
-			if image.Build == nil || !image.Build.Disabled {
-				imagesToBuild++
-			}
+			imagesToBuild++
 		}
 		if len(conf.Images) <= 1 || imagesToBuild <= 1 {
 			options.Sequential = true
@@ -95,10 +93,6 @@ func (c *controller) Build(ctx *devspacecontext.Context, images []string, option
 		if len(images) > 0 && !stringutil.Contains(images, key) {
 			continue
 		}
-		if imageConf.Build != nil && imageConf.Build.Disabled {
-			ctx.Log.Infof("Skipping building image %s", key)
-			continue
-		}
 
 		// This is necessary for parallel build otherwise we would override the image conf pointer during the loop
 		cImageConf := *imageConf

pkg/devspace/config/loader/validate.go

@@ -216,37 +216,24 @@ func validateHooks(config *latest.Config) error {
 func validateDeployments(config *latest.Config) error {
 	for index, deployConfig := range config.Deployments {
 		if deployConfig.Name == "" {
-			return errors.Errorf("deployments[%d].name is required", index)
+			return errors.Errorf("deployments[%s].name is required", index)
 		}
 		if encoding.IsUnsafeName(deployConfig.Name) {
-			return fmt.Errorf("deployments[%d].name %s has to match the following regex: %v", index, deployConfig.Name, encoding.UnsafeNameRegEx.String())
+			return fmt.Errorf("deployments[%s].name %s has to match the following regex: %v", index, deployConfig.Name, encoding.UnsafeNameRegEx.String())
 		}
 		if deployConfig.Helm == nil && deployConfig.Kubectl == nil {
 			return errors.Errorf("Please specify either helm or kubectl as deployment type in deployment %s", deployConfig.Name)
 		}
-		if deployConfig.Helm != nil {
-			if deployConfig.Helm.Chart == nil &&
-				(deployConfig.Helm.ComponentChart == nil || !*deployConfig.Helm.ComponentChart) {
-				return errors.Errorf("deployments[%d].helm.chart or deployments[%d].helm.componentChart is required", index, index)
-			}
-
-			if deployConfig.Helm.Chart != nil &&
-				((deployConfig.Helm.Chart.Name != "" && deployConfig.Helm.Chart.Git != nil) ||
-					(deployConfig.Helm.Chart.Name == "" && deployConfig.Helm.Chart.Git == nil)) {
-				return errors.Errorf("deployments[%d].helm.chart.name or deployments[%d].helm.chart.git is required", index, index)
-			}
-		}
-
 		if deployConfig.Kubectl != nil && deployConfig.Kubectl.Manifests == nil {
-			return errors.Errorf("deployments[%d].kubectl.manifests is required", index)
+			return errors.Errorf("deployments[%s].kubectl.manifests is required", index)
 		}
 	}
 
 	return nil
 }
 
 func ValidateComponentConfig(deployConfig *latest.DeploymentConfig, overwriteValues map[string]interface{}) error {
-	if deployConfig.Helm != nil && deployConfig.Helm.ComponentChart != nil && *deployConfig.Helm.ComponentChart {
+	if deployConfig.Helm != nil && deployConfig.Helm.Chart == nil {
 		b, err := yaml.Marshal(overwriteValues)
 		if err != nil {
 			return errors.Errorf("deployments[%s].helm: Error marshaling overwrite values: %v", deployConfig.Name, err)
@@ -305,7 +292,7 @@ func validateImages(config *latest.Config) error {
 		if images[imageConf.Image] {
 			return errors.Errorf("multiple image definitions with the same image name are not allowed")
 		}
-		if imageConf.RebuildStrategy != latest.RebuildStrategyDefault && imageConf.RebuildStrategy != latest.RebuildStrategyAlways && imageConf.RebuildStrategy != latest.RebuildStrategyIgnoreContextChanges {
+		if imageConf.RebuildStrategy != "" && imageConf.RebuildStrategy != latest.RebuildStrategyDefault && imageConf.RebuildStrategy != latest.RebuildStrategyAlways && imageConf.RebuildStrategy != latest.RebuildStrategyIgnoreContextChanges {
 			return errors.Errorf("images.%s.rebuildStrategy %s is invalid. Please choose one of %v", imageConfigName, string(imageConf.RebuildStrategy), []latest.RebuildStrategy{latest.RebuildStrategyAlways, latest.RebuildStrategyIgnoreContextChanges})
 		}
 		if imageConf.Build != nil && imageConf.Build.Kaniko != nil && imageConf.Build.Kaniko.EnvFrom != nil {
@@ -335,22 +322,19 @@ func validateDev(config *latest.Config) error {
 		if encoding.IsUnsafeName(devPodName) {
 			return fmt.Errorf("dev[%s] has to match the following regex: %v", devPodName, encoding.UnsafeNameRegEx.String())
 		}
-		if len(devPod.LabelSelector) == 0 && devPod.ImageSelector == "" && devPod.Pod == "" {
-			return errors.Errorf("dev[%s]: image selector, pod and label selector are nil", devPodName)
+		if len(devPod.LabelSelector) == 0 && devPod.ImageSelector == "" {
+			return errors.Errorf("dev[%s]: image selector and label selector are nil", devPodName)
 		}
 
 		definedSelectors := 0
-		if devPod.Pod != "" {
-			definedSelectors++
-		}
 		if devPod.ImageSelector != "" {
 			definedSelectors++
 		}
 		if len(devPod.LabelSelector) > 0 {
 			definedSelectors++
 		}
 		if definedSelectors > 1 {
-			return errors.Errorf("dev[%s]: image selector, pod and label selector cannot all be defined", devPodName)
+			return errors.Errorf("dev[%s]: image selector and label selector cannot all be defined", devPodName)
 		}
 
 		err := validateDevContainer(fmt.Sprintf("dev[%s]", devPodName), &devPod.DevContainer, false)
@@ -359,7 +343,7 @@ func validateDev(config *latest.Config) error {
 		}
 		if len(devPod.Containers) > 0 {
 			for i, c := range devPod.Containers {
-				err := validateDevContainer(fmt.Sprintf("dev[%s].containers[%d]", devPodName, i), &c, true)
+				err := validateDevContainer(fmt.Sprintf("dev[%s].containers[%s]", devPodName, i), c, true)
 				if err != nil {
 					return err
 				}
@@ -408,8 +392,7 @@ func validateDevContainer(path string, devContainer *latest.DevContainer, nameRe
 func EachDevContainer(devPod *latest.DevPod, each func(devContainer *latest.DevContainer) bool) {
 	if len(devPod.Containers) > 0 {
 		for _, devContainer := range devPod.Containers {
-			d := devContainer
-			cont := each(&d)
+			cont := each(devContainer)
 			if !cont {
 				break
 			}

pkg/devspace/config/versions/latest/schema.go

@@ -93,21 +93,12 @@ type Pipeline struct {
 	// Name of the pipeline, will be filled automatically
 	Name string `yaml:"name,omitempty" json:"name,omitempty"`
 
-	// Rerun defines when this job should get reexecuted
-	Rerun *JobRerun `yaml:"rerun,omitempty" json:"rerun,omitempty"`
-
 	// Steps are the steps that are run in order for this job
 	Steps []PipelineStep `yaml:"steps,omitempty" json:"steps,omitempty"`
 }
 
-type JobRerun struct {
-}
-
 // PipelineStep is a step within a single pipeline
 type PipelineStep struct {
-	// Name of the pipeline step to execute
-	Name string `yaml:"name,omitempty" json:"name,omitempty"`
-
 	// If defines a condition as shell command to check if the command
 	// should get executed.
 	If string `yaml:"if,omitempty" json:"if,omitempty"`
@@ -120,11 +111,8 @@ type PipelineStep struct {
 	// pipeline step
 	Run string `yaml:"run,omitempty" json:"run,omitempty"`
 
-	// Directory is the working directory of the pipeline step
-	Directory string `yaml:"directory,omitempty" json:"directory,omitempty"`
-
-	// Env are additional environment variables to use for this pipeline step.
-	Env map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
+	// WorkingDir is the working directory of the pipeline step
+	WorkingDir string `yaml:"workingDir,omitempty" json:"workingDir,omitempty"`
 }
 
 type RequireConfig struct {
@@ -219,7 +207,7 @@ type RebuildStrategy string
 
 // List of values that source can take
 const (
-	RebuildStrategyDefault              RebuildStrategy = ""
+	RebuildStrategyDefault              RebuildStrategy = "default"
 	RebuildStrategyAlways               RebuildStrategy = "always"
 	RebuildStrategyIgnoreContextChanges RebuildStrategy = "ignoreContextChanges"
 )
@@ -239,10 +227,6 @@ type BuildConfig struct {
 	// If custom is specified, DevSpace will build the image with the help of
 	// a custom script.
 	Custom *CustomConfig `yaml:"custom,omitempty" json:"custom,omitempty"`
-
-	// This overrides other options and is able to disable the build for this image.
-	// Useful if you just want to select the image in a sync path or via devspace enter --image
-	Disabled bool `yaml:"disabled,omitempty" json:"disabled,omitempty"`
 }
 
 // DockerConfig tells the DevSpace CLI to build with Docker on Minikube or on localhost
@@ -511,7 +495,6 @@ type BuildOptions struct {
 type DeploymentConfig struct {
 	Name      string         `yaml:"name" json:"name"`
 	Namespace string         `yaml:"namespace,omitempty" json:"namespace,omitempty"`
-	Disabled  bool           `yaml:"disabled,omitempty" json:"disabled,omitempty"`
 	Helm      *HelmConfig    `yaml:"helm,omitempty" json:"helm,omitempty"`
 	Kubectl   *KubectlConfig `yaml:"kubectl,omitempty" json:"kubectl,omitempty"`
 }
@@ -697,7 +680,6 @@ type RollingUpdateConfig struct {
 // HelmConfig defines the specific helm options used during deployment
 type HelmConfig struct {
 	Chart            *ChartConfig           `yaml:"chart,omitempty" json:"chart,omitempty"`
-	ComponentChart   *bool                  `yaml:"componentChart,omitempty" json:"componentChart,omitempty"`
 	Values           map[string]interface{} `yaml:"values,omitempty" json:"values,omitempty"`
 	ValuesFiles      []string               `yaml:"valuesFiles,omitempty" json:"valuesFiles,omitempty"`
 	ReplaceImageTags bool                   `yaml:"replaceImageTags,omitempty" json:"replaceImageTags,omitempty"`
@@ -719,22 +701,12 @@ type HelmConfig struct {
 
 // ChartConfig defines the helm chart options
 type ChartConfig struct {
-	Name     string     `yaml:"name,omitempty" json:"name,omitempty"`
-	Version  string     `yaml:"version,omitempty" json:"version,omitempty"`
-	RepoURL  string     `yaml:"repo,omitempty" json:"repo,omitempty"`
-	Username string     `yaml:"username,omitempty" json:"username,omitempty"`
-	Password string     `yaml:"password,omitempty" json:"password,omitempty"`
-	Git      *GitSource `yaml:"git,omitempty" json:"git,omitempty"`
-}
-
-//GitSource defines the git repository options
-type GitSource struct {
-	URL       string   `yaml:"url,omitempty" json:"url,omitempty"`
-	CloneArgs []string `yaml:"cloneArgs,omitempty" json:"cloneArgs,omitempty"`
-	Branch    string   `yaml:"branch,omitempty" json:"branch,omitempty"`
-	Tag       string   `yaml:"tag,omitempty" json:"tag,omitempty"`
-	Revision  string   `yaml:"revision,omitempty" json:"revision,omitempty"`
-	SubPath   string   `yaml:"subPath,omitempty" json:"subPath,omitempty"`
+	Name     string        `yaml:"name,omitempty" json:"name,omitempty"`
+	Version  string        `yaml:"version,omitempty" json:"version,omitempty"`
+	RepoURL  string        `yaml:"repo,omitempty" json:"repo,omitempty"`
+	Username string        `yaml:"username,omitempty" json:"username,omitempty"`
+	Password string        `yaml:"password,omitempty" json:"password,omitempty"`
+	Source   *SourceConfig `yaml:",inline" json:",inline"`
 }
 
 // KubectlConfig defines the specific kubectl options used during deployment
@@ -750,7 +722,6 @@ type KubectlConfig struct {
 
 type DevPod struct {
 	Name          string            `yaml:"name,omitempty" json:"name,omitempty"`
-	Pod           string            `yaml:"pod,omitempty" json:"pod,omitempty"`
 	ImageSelector string            `yaml:"imageSelector,omitempty" json:"imageSelector,omitempty"`
 	LabelSelector map[string]string `yaml:"labelSelector,omitempty" json:"labelSelector,omitempty"`
 	Namespace     string            `yaml:"namespace,omitempty" json:"namespace,omitempty"`
@@ -764,7 +735,7 @@ type DevPod struct {
 
 	// Container Options
 	DevContainer `yaml:",inline" json:",inline"`
-	Containers   []DevContainer `yaml:"containers,omitempty" json:"containers,omitempty"`
+	Containers   map[string]*DevContainer `yaml:"containers,omitempty" json:"containers,omitempty"`
 }
 
 type DevContainer struct {
@@ -1000,7 +971,6 @@ type DependencyConfig struct {
 	DisableProfileActivation bool            `yaml:"disableProfileActivation,omitempty" json:"disableProfileActivation,omitempty"`
 	Vars                     []DependencyVar `yaml:"vars,omitempty" json:"vars,omitempty"`
 	OverwriteVars            bool            `yaml:"overwriteVars,omitempty" json:"overwriteVars,omitempty"`
-	SkipBuild                bool            `yaml:"skipBuild,omitempty" json:"skipBuild,omitempty"`
 	IgnoreDependencies       bool            `yaml:"ignoreDependencies,omitempty" json:"ignoreDependencies,omitempty"`
 	Namespace                string          `yaml:"namespace,omitempty" json:"namespace,omitempty"`
 }
@@ -1040,7 +1010,6 @@ type SourceConfig struct {
 	Branch         string   `yaml:"branch,omitempty" json:"branch,omitempty"`
 	Tag            string   `yaml:"tag,omitempty" json:"tag,omitempty"`
 	Revision       string   `yaml:"revision,omitempty" json:"revision,omitempty"`
-	ConfigName     string   `yaml:"configName,omitempty" json:"configName,omitempty"`
 
 	Path string `yaml:"path,omitempty" json:"path,omitempty"`
 }