refactor: exclude .git, updateImageTags & devImage

Author: FabianKramm

cmd/init.go

@@ -625,7 +625,7 @@ func (cmd *InitCmd) addDevConfig(config *latest.Config, imageName, image string,
 }, replacePodPatches...)
 }
 
-config.Dev["default"].ReplaceImage = fmt.Sprintf("loftsh/%s:latest", language)
+config.Dev["default"].DevImage = fmt.Sprintf("loftsh/%s:latest", language)
 config.Dev["default"].Patches = replacePodPatches
 }
 

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

@@ -473,10 +473,11 @@ type CustomConfigCommand struct {
 
 // DeploymentConfig defines the configuration how the devspace should be deployed
 type DeploymentConfig struct {
-Name string `yaml:"name" json:"name"`
-Namespace string `yaml:"namespace,omitempty" json:"namespace,omitempty"`
-Helm *HelmConfig `yaml:"helm,omitempty" json:"helm,omitempty"`
-Kubectl *KubectlConfig `yaml:"kubectl,omitempty" json:"kubectl,omitempty"`
+Name string `yaml:"name" json:"name"`
+Namespace string `yaml:"namespace,omitempty" json:"namespace,omitempty"`
+UpdateImageTags bool `yaml:"updateImageTags,omitempty" json:"updateImageTags,omitempty"`
+Helm *HelmConfig `yaml:"helm,omitempty" json:"helm,omitempty"`
+Kubectl *KubectlConfig `yaml:"kubectl,omitempty" json:"kubectl,omitempty"`
 }
 
 // ComponentConfig holds the component information
@@ -659,11 +660,10 @@ type RollingUpdateConfig struct {
 
 // HelmConfig defines the specific helm options used during deployment
 type HelmConfig struct {
-Chart *ChartConfig `yaml:"chart,omitempty" json:"chart,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"`
-DisplayOutput bool `yaml:"displayOutput,omitempty" json:"output,omitempty"`
+Chart *ChartConfig `yaml:"chart,omitempty" json:"chart,omitempty"`
+Values map[string]interface{} `yaml:"values,omitempty" json:"values,omitempty"`
+ValuesFiles []string `yaml:"valuesFiles,omitempty" json:"valuesFiles,omitempty"`
+DisplayOutput bool `yaml:"displayOutput,omitempty" json:"output,omitempty"`
 
 TemplateArgs []string `yaml:"templateArgs,omitempty" json:"templateArgs,omitempty"`
 UpgradeArgs []string `yaml:"upgradeArgs,omitempty" json:"upgradeArgs,omitempty"`
@@ -682,12 +682,11 @@ type ChartConfig struct {
 
 // KubectlConfig defines the specific kubectl options used during deployment
 type KubectlConfig struct {
-Manifests []string `yaml:"manifests,omitempty" json:"manifests,omitempty"`
-Kustomize *bool `yaml:"kustomize,omitempty" json:"kustomize,omitempty"`
-KustomizeArgs []string `yaml:"kustomizeArgs,omitempty" json:"kustomizeArgs,omitempty"`
-ReplaceImageTags bool `yaml:"replaceImageTags,omitempty" json:"replaceImageTags,omitempty"`
-CreateArgs []string `yaml:"createArgs,omitempty" json:"createArgs,omitempty"`
-ApplyArgs []string `yaml:"applyArgs,omitempty" json:"applyArgs,omitempty"`
+Manifests []string `yaml:"manifests,omitempty" json:"manifests,omitempty"`
+Kustomize *bool `yaml:"kustomize,omitempty" json:"kustomize,omitempty"`
+KustomizeArgs []string `yaml:"kustomizeArgs,omitempty" json:"kustomizeArgs,omitempty"`
+CreateArgs []string `yaml:"createArgs,omitempty" json:"createArgs,omitempty"`
+ApplyArgs []string `yaml:"applyArgs,omitempty" json:"applyArgs,omitempty"`
 
 KustomizeBinaryPath string `yaml:"kustomizeBinaryPath,omitempty" json:"kustomizeBinaryPath,omitempty"`
 KubectlBinaryPath string `yaml:"kubectlBinaryPath,omitempty" json:"kubectlBinaryPath,omitempty"`
@@ -728,7 +727,7 @@ type DevContainer struct {
 Terminal *Terminal `yaml:"terminal,omitempty" json:"terminal,omitempty"`
 Logs *Logs `yaml:"logs,omitempty" json:"logs,omitempty"`
 Attach *Attach `yaml:"attach,omitempty" json:"attach,omitempty"`
-ReplaceImage string `yaml:"replaceImage,omitempty" json:"replaceImage,omitempty"`
+DevImage  string `yaml:"devImage,omitempty" json:"devImage,omitempty"`
 PersistPaths []PersistentPath `yaml:"persistPaths,omitempty" json:"persistPaths,omitempty"`
 Sync []*SyncConfig `yaml:"sync,omitempty" json:"sync,omitempty" patchStrategy:"merge" patchMergeKey:"localSubPath"`
 }

pkg/devspace/config/versions/v1beta11/upgrade.go

@@ -433,7 +433,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 log.Warnf("deployments[*].helm.deleteArgs is not supported anymore in v6")
 }
 if deployment.Helm.ReplaceImageTags == nil || *deployment.Helm.ReplaceImageTags {
-nextConfig.Deployments[name].Helm.ReplaceImageTags = true
+nextConfig.Deployments[name].UpdateImageTags = true
 }
 } else if deployment.Kubectl != nil {
 nextConfig.Deployments[name].Kubectl = &next.KubectlConfig{
@@ -448,7 +448,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
 log.Warnf("deployments[*].kubectl.deleteArgs is not supported anymore in v6")
 }
 if deployment.Kubectl.ReplaceImageTags == nil || *deployment.Kubectl.ReplaceImageTags {
-nextConfig.Deployments[name].Kubectl.ReplaceImageTags = true
+nextConfig.Deployments[name].UpdateImageTags = true
 }
 }
 }
@@ -530,7 +530,7 @@ func (c *Config) mergeDevConfig(log log.Logger) (map[string]*next.DevPod, error)
 }
 
 devContainer := getMatchingDevContainer(devPod, replacePod.ContainerName)
-devContainer.ReplaceImage = replacePod.ReplaceImage
+devContainer.DevImage = replacePod.ReplaceImage
 for _, p := range replacePod.PersistPaths {
 nextPersistentPath := next.PersistentPath{
 Path: p.Path,

pkg/devspace/deploy/deployer/helm/deploy.go

@@ -192,7 +192,7 @@ func (d *DeployConfig) getDeploymentValues(ctx *devspacecontext.Context) (bool,
 return false, nil, errors.Errorf("Couldn't deploy chart, error reading from chart values %s: %v", chartValuesPath, err)
 }
 
-if d.DeploymentConfig.Helm.ReplaceImageTags {
+if d.DeploymentConfig.UpdateImageTags {
 redeploy, err := legacy.ReplaceImageNames(overwriteValues, ctx.Config, ctx.Dependencies, nil)
 if err != nil {
 return false, nil, err
@@ -213,7 +213,7 @@ func (d *DeployConfig) getDeploymentValues(ctx *devspacecontext.Context) (bool,
 }
 
 // Replace image names
-if d.DeploymentConfig.Helm.ReplaceImageTags {
+if d.DeploymentConfig.UpdateImageTags {
 redeploy, err := legacy.ReplaceImageNames(overwriteValuesFromPath, ctx.Config, ctx.Dependencies, nil)
 if err != nil {
 return false, nil, err
@@ -228,7 +228,7 @@ func (d *DeployConfig) getDeploymentValues(ctx *devspacecontext.Context) (bool,
 // Load override values from data and merge them
 if d.DeploymentConfig.Helm.Values != nil {
 enableLegacy := false
-if d.DeploymentConfig.Helm.ReplaceImageTags {
+if d.DeploymentConfig.UpdateImageTags {
 enableLegacy = true
 }
 redeploy, _, err := runtimevar.NewRuntimeResolver(ctx.WorkingDir, enableLegacy).FillRuntimeVariablesWithRebuild(ctx.Context, d.DeploymentConfig.Helm.Values, ctx.Config, ctx.Dependencies)

pkg/devspace/deploy/deployer/kubectl/kubectl.go

@@ -221,7 +221,7 @@ func (d *DeployConfig) getReplacedManifest(ctx *devspacecontext.Context, manifes
 Namespace: resource.GetNamespace(),
 })
 
-if d.DeploymentConfig.Kubectl.ReplaceImageTags {
+if d.DeploymentConfig.UpdateImageTags {
 redeploy, err := legacy.ReplaceImageNamesStringMap(resource.Object, ctx.Config, ctx.Dependencies, map[string]bool{"image": true})
 if err != nil {
 return false, "", nil, err

pkg/devspace/devpod/devpod.go

@@ -410,7 +410,7 @@ func needPodReplace(devPodConfig *latest.DevPod) bool {
 }
 
 func needPodReplaceContainer(devContainer *latest.DevContainer) bool {
-if devContainer.ReplaceImage != "" {
+if devContainer.DevImage != "" {
 return true
 }
 if len(devContainer.PersistPaths) > 0 {

pkg/devspace/services/podreplace/builder.go

@@ -413,10 +413,10 @@ func hashConfig(replacePod *latest.DevPod) (string, error) {
 func replaceImagesInPodSpec(ctx *devspacecontext.Context, podSpec *corev1.PodSpec, devPod *latest.DevPod) error {
 var err error
 loader.EachDevContainer(devPod, func(devContainer *latest.DevContainer) bool {
-if devContainer.ReplaceImage == "" {
+if devContainer.DevImage == "" {
 return true
 }
-err = replaceImageInPodSpec(ctx, podSpec, devPod.LabelSelector, devPod.ImageSelector, devContainer.Container, devContainer.ReplaceImage)
+err = replaceImageInPodSpec(ctx, podSpec, devPod.LabelSelector, devPod.ImageSelector, devContainer.Container, devContainer.DevImage)
 if err != nil {
 return false
 }

pkg/devspace/sync/sync.go

@@ -108,6 +108,7 @@ func NewSync(ctx context.Context, localPath string, options Options) (*Sync, err
 
 // We exclude the sync log to prevent an endless loop in upstream
 options.ExcludePaths = append(options.ExcludePaths, ".devspace/")
+options.ExcludePaths = append(options.ExcludePaths, ".git/")
 
 // Create sync structure
 s := &Sync{