Tiller creates AC resource definitions

glide.lock

@@ -1,5 +1,5 @@
-hash: 8ae84a3225f6cc31f91cc42dc8cf816792a989838254964cdcaaa57c75c37cdc
-updated: 2016-12-01T17:35:05.940550036-07:00
+hash: 2399faed85452e1edc64e88c2120139ce2023892df79ec54ac4067d1695844da
+updated: 2016-12-06T14:33:44.101187141+01:00
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -218,6 +218,10 @@ imports:
   version: 1e60e4ce482a1e2c7b9c9be667535ef152e04300
 - name: github.com/mattn/go-runewidth
   version: d6bea18f789704b5f83375793155289da36a3c7f
+- name: github.com/Mirantis/k8s-appcontroller
+  version: 65c6ca6dc3e63ab51ee9ef88585140c28b2d67f7
+  subpackages:
+  - cmd/format
 - name: github.com/pborman/uuid
   version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
 - name: github.com/russross/blackfriday
@@ -298,7 +302,7 @@ imports:
 - name: gopkg.in/yaml.v2
   version: a83829b6f1293c91addabc89d0571c246397bbf4
 - name: k8s.io/client-go
-  version: 0b62e254fe853d89b1d8d3445bbdab11bcc11bc3
+  version: 3a5b96cfd3d3ff1d53d979b4297c4f3b869aab09
   subpackages:
   - 1.4/pkg/api
   - 1.4/pkg/api/endpoints

glide.yaml

@@ -51,3 +51,5 @@ import:
   - openpgp
 - package: github.com/gobwas/glob
   version: ^0.2.1
+- package: github.com/Mirantis/k8s-appcontroller
+  version: ~0.2.0

pkg/tiller/release_server.go

@@ -32,6 +32,8 @@ import (
 	ctx "golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 
+	"github.com/Mirantis/k8s-appcontroller/cmd/format"
+
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/proto/hapi/chart"
@@ -625,6 +627,8 @@ func (s *ReleaseServer) InstallRelease(c ctx.Context, req *services.InstallRelea
 		return res, err
 	}
 
+	//log.Printf(rel.Manifest)
+
 	res, err := s.performRelease(rel, req)
 	if err != nil {
 		log.Printf("Failed install perform step: %s", err)
@@ -771,12 +775,32 @@ func (s *ReleaseServer) renderResources(ch *chart.Chart, values chartutil.Values
 	b := bytes.NewBuffer(nil)
 	for _, m := range manifests {
 		b.WriteString("\n---\n# Source: " + m.name + "\n")
-		b.WriteString(m.content)
+		log.Printf("Trying to wrap %s", m.name)
+		wrapped, err := format.Yaml{}.Wrap(getInput(m.content, 2))
+		if err != nil {
+			log.Printf("didn't wrap %s: %s", m.name, err)
+			b.WriteString(m.content)
+			log.Println(getInput(m.content, 2))
+		}
+		log.Printf("wrapped %s", m.name)
+
+		b.WriteString(wrapped)
 	}
 
+	//log.Println(b.String())
+
 	return hooks, b, notes, nil
 }
 
+func getInput(in string, indent int) string {
+	spaces := strings.Repeat(" ", indent)
+
+	result := spaces + strings.Replace(in, "\n", "\n"+spaces, -1)
+
+	return result
+
+}
+
 func (s *ReleaseServer) recordRelease(r *release.Release, reuse bool) {
 	if reuse {
 		if err := s.env.Releases.Update(r); err != nil {
@@ -802,6 +826,7 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *services.Install
 			return res, err
 		}
 	}
+	log.Printf("release name: %s", req.Name)
 
 	switch h, err := s.env.Releases.History(req.Name); {
 	// if this is a replace operation, append to the release history