Merge pull request #917 from weaveworks/issue/916-missing-sync

Make sure multi-yamels are delimited
fluxcd · Jan 26, 2018 · 85a2602 · 85a2602
2 parents 9ce750a + 7ab9cbd
commit 85a2602
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cluster/kubernetes/release.go b/cluster/kubernetes/release.go
@@ -58,6 +58,7 @@ func (c *Kubectl) apply(logger log.Logger, cs changeSet, errs cluster.SyncError)
 		if len(objs) == 0 {
 			return
 		}
+		logger.Log("cmd", cmd, "args", strings.Join(args, " "), "count", len(objs))
 		args = append(args, cmd)
 		if err := c.doCommand(logger, makeMultidoc(objs), args...); err != nil {
 			for _, obj := range objs {
@@ -103,7 +104,7 @@ func (c *Kubectl) doCommand(logger log.Logger, r io.Reader, args ...string) erro
 func makeMultidoc(objs []obj) *bytes.Buffer {
 	buf := &bytes.Buffer{}
 	for _, obj := range objs {
-		buf.WriteString("---\n" + string(obj.bytes))
+		buf.WriteString("\n---\n" + string(obj.bytes))
 	}
 	return buf
 }