Merge pull request #259 from crawford/content

asset/ignition: clean up templates

pkg/asset/ignition/BUILD.bazel

@@ -14,7 +14,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/asset:go_default_library",
-        "//pkg/asset/ignition/templates:go_default_library",
+        "//pkg/asset/ignition/content:go_default_library",
         "//pkg/asset/installconfig:go_default_library",
         "//pkg/asset/kubeconfig:go_default_library",
         "//pkg/asset/tls:go_default_library",
@@ -37,7 +37,7 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//pkg/asset:go_default_library",
-        "//pkg/asset/ignition/templates:go_default_library",
+        "//pkg/asset/ignition/content:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/vincent-petithory/dataurl:go_default_library",
     ],

pkg/asset/ignition/bootstrap.go

@@ -13,7 +13,7 @@ import (
 	ignition "github.com/coreos/ignition/config/v2_2/types"
 
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/openshift/installer/pkg/asset/ignition/templates"
+	"github.com/openshift/installer/pkg/asset/ignition/content"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/kubeconfig"
 	"github.com/openshift/installer/pkg/asset/tls"
@@ -143,9 +143,9 @@ func (a *bootstrap) Generate(dependencies map[asset.Asset]*asset.State) (*asset.
 
 	config.Systemd.Units = append(
 		config.Systemd.Units,
-		ignition.Unit{Name: "bootkube.service", Contents: templates.BootkubeSystemdContents},
-		ignition.Unit{Name: "tectonic.service", Contents: templates.TectonicSystemdContents, Enabled: util.BoolToPtr(true)},
-		ignition.Unit{Name: "kubelet.service", Contents: string(applyTemplateData(templates.KubeletSystemdContents, templateData)), Enabled: util.BoolToPtr(true)},
+		ignition.Unit{Name: "bootkube.service", Contents: content.BootkubeSystemdContents},
+		ignition.Unit{Name: "tectonic.service", Contents: content.TectonicSystemdContents, Enabled: util.BoolToPtr(true)},
+		ignition.Unit{Name: "kubelet.service", Contents: applyTemplateData(content.KubeletSystemdTemplate, templateData), Enabled: util.BoolToPtr(true)},
 	)
 
 	config.Passwd.Users = append(
@@ -220,15 +220,15 @@ func (a *bootstrap) addBootkubeFiles(config *ignition.Config, dependencies map[a
 		config.Storage.Files,
 		fileFromAsset("/opt/tectonic/auth/kubeconfig", 0400, dependencies[a.kubeconfig], 0),
 		fileFromAsset("/opt/tectonic/auth/kubeconfig-kubelet", 0400, dependencies[a.kubeconfigKubelet], 0),
-		fileFromBytes("/opt/tectonic/bootkube.sh", 0555, applyTemplateData(templates.BootkubeShFileContents, templateData)),
+		fileFromString("/opt/tectonic/bootkube.sh", 0555, applyTemplateData(content.BootkubeShFileTemplate, templateData)),
 	)
 }
 
 func (a *bootstrap) addTectonicFiles(config *ignition.Config, dependencies map[asset.Asset]*asset.State, templateData *bootstrapTemplateData) {
 	// TODO (staebler) - missing manifests from tectonic module
 	config.Storage.Files = append(
 		config.Storage.Files,
-		fileFromBytes("/opt/tectonic/tectonic.sh", 0555, applyTemplateData(templates.TectonicShFileContents, templateData)),
+		fileFromString("/opt/tectonic/tectonic.sh", 0555, content.TectonicShFileContents),
 	)
 }
 
@@ -281,14 +281,10 @@ func getCloudProviderConfig(installConfig *types.InstallConfig) string {
 	return ""
 }
 
-func applyTemplateData(templateString string, templateData interface{}) []byte {
-	t, err := template.New("").Parse(templateString)
-	if err != nil {
-		panic(err)
-	}
+func applyTemplateData(template *template.Template, templateData interface{}) string {
 	buf := &bytes.Buffer{}
-	if err := t.Execute(buf, &templateData); err != nil {
+	if err := template.Execute(buf, templateData); err != nil {
 		panic(err)
 	}
-	return buf.Bytes()
+	return buf.String()
 }

pkg/asset/ignition/bootstrap_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/openshift/installer/pkg/asset/ignition/templates"
+	"github.com/openshift/installer/pkg/asset/ignition/content"
 )
 
 // TestBootstrapGenerate tests generating the bootstrap asset.
@@ -245,11 +245,11 @@ machines:
 		bootstrapState.Contents[0].Data,
 		systemdUnitAssertion{
 			name:     "bootkube.service",
-			contents: templates.BootkubeSystemdContents,
+			contents: content.BootkubeSystemdContents,
 		},
 		systemdUnitAssertion{
 			name:     "tectonic.service",
-			contents: templates.TectonicSystemdContents,
+			contents: content.TectonicSystemdContents,
 		},
 		systemdUnitAssertion{
 			name:     "kubelet.service",

pkg/asset/ignition/templates/BUILD.bazel → pkg/asset/ignition/content/BUILD.bazel

@@ -8,6 +8,6 @@ go_library(
         "kubelet.go",
         "tectonic.go",
     ],
-    importpath = "github.com/openshift/installer/pkg/asset/ignition/templates",
+    importpath = "github.com/openshift/installer/pkg/asset/ignition/content",
     visibility = ["//visibility:public"],
 )

pkg/asset/ignition/templates/bootkube.go → pkg/asset/ignition/content/bootkube.go

@@ -1,4 +1,8 @@
-package templates
+package content
+
+import (
+	"text/template"
+)
 
 const (
 	// BootkubeSystemdContents is a service for running bootkube on the bootstrap
@@ -15,10 +19,12 @@ ExecStart=/opt/tectonic/bootkube.sh
 
 Restart=on-failure
 RestartSec=5s`
+)
 
-	// BootkubeShFileContents is a script file for running bootkube on the
+var (
+	// BootkubeShFileTemplate is a script file for running bootkube on the
 	// bootstrap nodes.
-	BootkubeShFileContents = `#!/usr/bin/env bash
+	BootkubeShFileTemplate = template.Must(template.New("bootkube.sh").Parse(`#!/usr/bin/env bash
 set -e
 
 mkdir --parents /etc/kubernetes/manifests/
@@ -137,5 +143,5 @@ podman run \
 	--network=host \
 	--entrypoint=/bootkube \
 	"{{.BootkubeImage}}" \
-	start --asset-dir=/assets`
+	start --asset-dir=/assets`))
 )

pkg/asset/ignition/content/doc.go

@@ -0,0 +1,3 @@
+// Package content contains the contents of files and systemd units to be added
+// to Ignition configs.
+package content

pkg/asset/ignition/templates/kubelet.go → pkg/asset/ignition/content/kubelet.go

@@ -1,9 +1,13 @@
-package templates
+package content
 
-const (
-	// KubeletSystemdContents is a service for running the kubelet on the
+import (
+	"text/template"
+)
+
+var (
+	// KubeletSystemdTemplate is a service for running the kubelet on the
 	// bootstrap nodes.
-	KubeletSystemdContents = `[Unit]
+	KubeletSystemdTemplate = template.Must(template.New("kubelet.service").Parse(`[Unit]
 Description=Kubernetes Kubelet
 Wants=rpc-statd.service
 
@@ -39,5 +43,5 @@ Restart=always
 RestartSec=10
 
 [Install]
-WantedBy=multi-user.target`
+WantedBy=multi-user.target`))
 )

pkg/asset/ignition/templates/tectonic.go → pkg/asset/ignition/content/tectonic.go

@@ -1,4 +1,4 @@
-package templates
+package content
 
 const (
 	// TectonicSystemdContents is a service that runs tectonic on the masters.

pkg/asset/ignition/node.go

@@ -25,6 +25,11 @@ func fileFromAsset(path string, mode int, assetState *asset.State, contentIndex
 	return fileFromBytes(path, mode, assetState.Contents[contentIndex].Data)
 }
 
+// fileFromString creates an ignition-config file with the given contents.
+func fileFromString(path string, mode int, contents string) ignition.File {
+	return fileFromBytes(path, mode, []byte(contents))
+}
+
 // fileFromAsset creates an ignition-config file with the given contents.
 func fileFromBytes(path string, mode int, contents []byte) ignition.File {
 	return ignition.File{