Merge pull request #350 from replicatedhq/divolgin/multi-doc

Split multi-doc files and honor exclude annotation on app updates

pkg/base/render.go

@@ -14,6 +14,7 @@ type RenderOptions struct {
 	LocalRegistryNamespace string
 	LocalRegistryUsername  string
 	LocalRegistryPassword  string
+	ExcludeKotsKinds       bool
 	Log                    *logger.Logger
 }
 

pkg/base/replicated.go

@@ -98,7 +98,16 @@ func renderReplicated(u *upstreamtypes.Upstream, renderOptions *RenderOptions) (
 			return nil, errors.Wrapf(err, "failed to convert upstream file %s to base", upstreamFile.Path)
 		}
 
-		base.Files = append(base.Files, baseFile)
+		baseFiles := convertToSingleDocs([]BaseFile{baseFile})
+		for _, f := range baseFiles {
+			include, err := f.ShouldBeIncludedInBaseKustomization(renderOptions.ExcludeKotsKinds)
+			if err != nil {
+				return nil, errors.Wrapf(err, "failed to check if base file %s should be included", f.Path)
+			}
+			if include {
+				base.Files = append(base.Files, f)
+			}
+		}
 	}
 
 	// render helm charts that were specified
@@ -186,6 +195,7 @@ func renderReplicated(u *upstreamtypes.Upstream, renderOptions *RenderOptions) (
 			SplitMultiDocYAML: true,
 			Namespace:         namespace,
 			HelmOptions:       localValues,
+			ExcludeKotsKinds:  renderOptions.ExcludeKotsKinds,
 			Log:               nil,
 		})
 		if err != nil {

pkg/pull/pull.go

@@ -236,6 +236,7 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 		LocalRegistryNamespace: pullOptions.RewriteImageOptions.Namespace,
 		LocalRegistryUsername:  pullOptions.RewriteImageOptions.Username,
 		LocalRegistryPassword:  pullOptions.RewriteImageOptions.Password,
+		ExcludeKotsKinds:       pullOptions.ExcludeKotsKinds,
 		Log:                    log,
 	}
 	log.ActionWithSpinner("Creating base")

pkg/rewrite/rewrite.go

@@ -94,6 +94,7 @@ func Rewrite(rewriteOptions RewriteOptions) error {
 		LocalRegistryNamespace: rewriteOptions.RegistryNamespace,
 		LocalRegistryUsername:  rewriteOptions.RegistryUsername,
 		LocalRegistryPassword:  rewriteOptions.RegistryPassword,
+		ExcludeKotsKinds:       rewriteOptions.ExcludeKotsKinds,
 		Log:                    log,
 	}
 	log.ActionWithSpinner("Creating base")