Merge pull request #1018 from laverya/exclude-kubernetes-patches-with-resources

Exclude kubernetes patches with resources

Author: laverya

integration/update/excluded-basic/expected/overlays/defaults/kustomization.yaml

@@ -1,15 +1,17 @@
-bases:
-- ../../base
+kind: ""
+apiversion: ""
 patchesJson6902:
-- path: chart-patch.json
-  target:
+- target:
     group: apps
+    version: v1beta2
     kind: Deployment
     name: basic
-    version: v1beta2
-- path: heritage-patch.json
-  target:
+  path: chart-patch.json
+- target:
     group: apps
+    version: v1beta2
     kind: Deployment
     name: basic
-    version: v1beta2
+  path: heritage-patch.json
+bases:
+- ../../base

integration/update/jenkins-deployment-labels/expected/overlays/defaults/kustomization.yaml

@@ -1,50 +1,52 @@
-bases:
-- ../../base
+kind: ""
+apiversion: ""
 patchesJson6902:
-- path: chart-patch.json
-  target:
+- target:
+    version: v1
     kind: PersistentVolumeClaim
     name: jenkins
+  path: chart-patch.json
+- target:
     version: v1
-- path: heritage-patch.json
-  target:
     kind: PersistentVolumeClaim
     name: jenkins
+  path: heritage-patch.json
+- target:
     version: v1
-- path: chart-patch.json
-  target:
     kind: Service
     name: jenkins-agent
-    version: v1
-- path: chart-patch.json
-  target:
+  path: chart-patch.json
+- target:
     group: apps
+    version: v1beta1
     kind: Deployment
     name: jenkins
-    version: v1beta1
-- path: heritage-patch.json
-  target:
+  path: chart-patch.json
+- target:
     group: apps
+    version: v1beta1
     kind: Deployment
     name: jenkins
-    version: v1beta1
-- path: chart-patch.json
-  target:
+  path: heritage-patch.json
+- target:
+    version: v1
     kind: Service
     name: jenkins
+  path: chart-patch.json
+- target:
     version: v1
-- path: heritage-patch.json
-  target:
     kind: Service
     name: jenkins
+  path: heritage-patch.json
+- target:
     version: v1
-- path: chart-patch.json
-  target:
     kind: Secret
     name: jenkins
+  path: chart-patch.json
+- target:
     version: v1
-- path: heritage-patch.json
-  target:
     kind: Secret
     name: jenkins
-    version: v1
+  path: heritage-patch.json
+bases:
+- ../../base

pkg/lifecycle/kustomize/daemonless.go

@@ -2,6 +2,7 @@ package kustomize
 
 import (
 	"context"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-kit/kit/log"
@@ -11,6 +12,7 @@ import (
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/replicatedhq/ship/pkg/api"
+	"github.com/replicatedhq/ship/pkg/constants"
 	"github.com/replicatedhq/ship/pkg/lifecycle"
 	"github.com/replicatedhq/ship/pkg/patch"
 	"github.com/replicatedhq/ship/pkg/state"
@@ -40,12 +42,6 @@ func NewDaemonlessKustomizer(
 func (l *Kustomizer) Execute(ctx context.Context, release *api.Release, step api.Kustomize) error {
 	debug := level.Debug(log.With(l.Logger, "struct", "daemonless.kustomizer", "method", "execute"))
 
-	debug.Log("event", "write.base.kustomization.yaml")
-	err := l.writeBase(step.Base)
-	if err != nil {
-		return errors.Wrap(err, "write base kustomization")
-	}
-
 	current, err := l.State.CachedState()
 	if err != nil {
 		return errors.Wrap(err, "load state")
@@ -61,6 +57,27 @@ func (l *Kustomizer) Execute(ctx context.Context, release *api.Release, step api
 		shipOverlay = kustomizeState.Ship()
 	}
 
+	debug.Log("event", "base.kustomization.check")
+	existingKustomize, err := l.FS.Exists(filepath.Join(step.Base, "kustomization.yaml"))
+	if err != nil {
+		return errors.Wrapf(err, "check for kustomization in %s", step.Base)
+	}
+	if existingKustomize {
+		// no need to write base, kustomization already exists
+		// but we do need to remove excluded bases
+		debug.Log("event", "exclude.kustomize.resources")
+		err = util.ExcludeKubernetesResources(l.FS, step.Base, constants.DefaultOverlaysPath, shipOverlay.ExcludedBases)
+		if err != nil {
+			return errors.Wrapf(err, "write base %s", step.Base)
+		}
+	} else {
+		debug.Log("event", "write.base.kustomization.yaml")
+		err = l.writeBase(step.Base)
+		if err != nil {
+			return errors.Wrap(err, "write base kustomization")
+		}
+	}
+
 	fs, err := l.getPotentiallyChrootedFs(release)
 	if err != nil {
 		debug.Log("event", "getFs.fail")

pkg/lifecycle/kustomize/kustomizer.go

@@ -214,16 +214,6 @@ func (l *Kustomizer) writeBase(base string) error {
 	}
 	shipOverlay := currentKustomize.Ship()
 
-	existingKustomize, err := l.FS.Exists(filepath.Join(base, "kustomization.yaml"))
-	if err != nil {
-		return errors.Wrapf(err, "check for kustomization in %s", base)
-	}
-	if existingKustomize {
-		// no need to write base, kustomization already exists
-		// but we do need to remove excluded bases
-		return errors.Wrapf(util.ExcludeKubernetesResources(l.FS, base, shipOverlay.ExcludedBases), "write base %s", base)
-	}
-
 	baseKustomization := ktypes.Kustomization{}
 	if err := l.FS.Walk(
 		base,