Merge pull request #19 from 2opremio/fix-configmap-template

Fix TLS CA configmap template

pkg/install/install.go

@@ -2,7 +2,6 @@ package install
 
 import (
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -18,7 +17,7 @@ type TemplateParameters struct {
 	TillerNamespace         string
 	SSHSecretName           string
 	EnableTillerTLS         bool
-	TillerTLSCACertContent  []byte
+	TillerTLSCACertContent  string
 	TillerTLSCertSecretName string
 }
 
@@ -35,9 +34,15 @@ func FillInTemplates(params TemplateParameters) (map[string][]byte, error) {
 		if err != nil {
 			return fmt.Errorf("cannot read embedded file %q: %s", info.Name(), err)
 		}
-
+		indent := func(n int, s string) string {
+			lines := strings.Split(s, "\n")
+			for i, l := range lines {
+				lines[i] = strings.Repeat(" ", n) + l
+			}
+			return strings.Join(lines, "\n")
+		}
 		manifestTemplate, err := template.New(info.Name()).
-			Funcs(template.FuncMap{"Base64Encode": base64.StdEncoding.EncodeToString}).
+			Funcs(template.FuncMap{"indent": indent}).
 			Parse(string(manifestTemplateBytes))
 		if err != nil {
 			return fmt.Errorf("cannot parse embedded file %q: %s", info.Name(), err)

pkg/install/install_test.go

@@ -38,7 +38,7 @@ func TestFillInTemplates(t *testing.T) {
 		TillerNamespace:         "tiller",
 		SSHSecretName:           "mysshsecretname",
 		EnableTillerTLS:         true,
-		TillerTLSCACertContent:  []byte("foo bar"),
+		TillerTLSCACertContent:  "foo\nbar\n",
 		TillerTLSCertSecretName: "mytlssecretname",
 	}, 4)
 }

pkg/install/templates/tiller-ca-cert-configmap.yaml.tmpl

@@ -2,10 +2,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: flux-helm-tls-ca-config
-  {{ if .Namespace }}
+  name: flux-helm-tls-ca-config{{ if .Namespace }}
   namespace: {{ .Namespace }}{{ end }}
 data:
   ca.crt: |
-    {{ Base64Encode .TillerTLSCACertContent }}
-{{- end -}}
+{{ indent 4 .TillerTLSCACertContent }}{{ end }}