From 8fac7c1a415d6ea5e41c28f4e7ab5c1ef0883997 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Wed, 8 Feb 2017 11:55:59 +0100
Subject: [PATCH] chore: Better example & gofmt

---
 example/prod-cluster.json        |  2 +-
 example/some-api/deployment.yaml |  0
 example/some-api/service.yaml    |  5 -----
 example/some-api/some-api.yaml   | 34 ++++++++++++++++++++++++++++++++
 main.go                          |  6 +++---
 templater/templater.go           |  9 ++++-----
 6 files changed, 42 insertions(+), 14 deletions(-)
 delete mode 100644 example/some-api/deployment.yaml
 delete mode 100644 example/some-api/service.yaml
 create mode 100644 example/some-api/some-api.yaml

diff --git a/example/prod-cluster.json b/example/prod-cluster.json
index 76246ca..70e2365 100644
--- a/example/prod-cluster.json
+++ b/example/prod-cluster.json
@@ -1,7 +1,7 @@
 {
   "context": "k8s.prod.mydomain.com",
   "global": {
-    "globalTest": "lizards"
+    "globalVar": "lizards"
   },
   "include": [
     {
diff --git a/example/some-api/deployment.yaml b/example/some-api/deployment.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/example/some-api/service.yaml b/example/some-api/service.yaml
deleted file mode 100644
index 6aee878..0000000
--- a/example/some-api/service.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-name: foo
-importantFeature: {{ .importantFeature }}
-port: {{ .apiPort }}
-globalTest: {{ .globalTest }}
diff --git a/example/some-api/some-api.yaml b/example/some-api/some-api.yaml
new file mode 100644
index 0000000..6f6a29a
--- /dev/null
+++ b/example/some-api/some-api.yaml
@@ -0,0 +1,34 @@
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: some-api
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: some-api
+    spec:
+      containers:
+        - image: my.container.repo/some-api:{{ .version }}
+          name: some-api
+          env:
+            - name: ENABLE_IMPORTANT_FEATURE
+              value: {{ .importantFeature }}
+            - name: SOME_GLOBAL_VAR
+              value: {{ .globalVar }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: some-api
+  labels:
+    app: some-api
+spec:
+  selector:
+    app: some-api
+  ports:
+    - port: 80
+      targetPort: {{ .apiPort }}
+      name: http
diff --git a/main.go b/main.go
index c33ec13..158c9a5 100644
--- a/main.go
+++ b/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"os"
 	"fmt"
+	"os"
 
 	"github.com/tazjin/kontemplate/context"
 	"github.com/tazjin/kontemplate/templater"
@@ -22,10 +22,10 @@ func main() {
 		os.Exit(1)
 	}
 
-	fmt.Fprintf(os.Stderr,"Applying cluster %s\n", c.Name)
+	fmt.Fprintf(os.Stderr, "Applying cluster %s\n", c.Name)
 
 	for _, rs := range c.ResourceSets {
-		fmt.Fprintf(os.Stderr,"Applying resource %s with values %v\n", rs.Name, rs.Values)
+		fmt.Fprintf(os.Stderr, "Applying resource %s with values %v\n", rs.Name, rs.Values)
 		resources, err := templater.LoadAndPrepareTemplates(c)
 
 		if err != nil {
diff --git a/templater/templater.go b/templater/templater.go
index f4be1e6..27beff3 100644
--- a/templater/templater.go
+++ b/templater/templater.go
@@ -1,16 +1,16 @@
 package templater
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
-	"strings"
 	"os"
 	"path"
+	"strings"
 	"text/template"
-	"bytes"
 
-	"github.com/tazjin/kontemplate/context"
 	"github.com/polydawn/meep"
+	"github.com/tazjin/kontemplate/context"
 )
 
 // Error that is caused by non-existent template files being specified
@@ -28,7 +28,7 @@ func LoadAndPrepareTemplates(c *context.Context) ([]string, error) {
 	output := make([]string, 0)
 
 	for _, rs := range c.ResourceSets {
-		fmt.Fprintf(os.Stderr,"Loading resources for %s\n", rs.Name)
+		fmt.Fprintf(os.Stderr, "Loading resources for %s\n", rs.Name)
 
 		rp := path.Join(c.BaseDir, rs.Name)
 		files, err := ioutil.ReadDir(rp)
@@ -40,7 +40,6 @@ func LoadAndPrepareTemplates(c *context.Context) ([]string, error) {
 			)
 		}
 
-
 		for _, file := range files {
 			if !file.IsDir() && isResourceFile(file) {
 				p := path.Join(rp, file.Name())