From 49dedd816ec7c0c73ec2c11b5b1e1b702c030062 Mon Sep 17 00:00:00 2001
From: Simon Menke <simon.menke@gmail.com>
Date: Tue, 3 May 2016 16:02:35 +0200
Subject: [PATCH] Fixed compile problems

---
 cmd/k8s/gen_configmap.go | 20 ++++++++++----------
 cmd/k8s/gen_secretmap.go | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cmd/k8s/gen_configmap.go b/cmd/k8s/gen_configmap.go
index 4c14dab..0155592 100644
--- a/cmd/k8s/gen_configmap.go
+++ b/cmd/k8s/gen_configmap.go
@@ -43,8 +43,8 @@ func genConfigMap(app *kingpin.Application, configDir, configMapName string) {
 		if name == ".DS_Store" {
 			continue
 		}
-		if len(name) > 253 || !nameRE.MatchString(name) {
-			app.Fatalf("%q must have at most 253 characters and match regex %s", name, nameRE.String())
+		if len(name) > 253 || !nameConfigMapRE.MatchString(name) {
+			app.Fatalf("%q must have at most 253 characters and match regex %s", name, nameConfigMapRE.String())
 		}
 
 		data, err := ioutil.ReadFile(path)
@@ -57,13 +57,13 @@ func genConfigMap(app *kingpin.Application, configDir, configMapName string) {
 			app.FatalIfError(err, "%v", err)
 		}
 
-		configMap.Files = append(configMap.Files, File{
+		configMap.Files = append(configMap.Files, ConfigMapFile{
 			Name:  name,
 			Value: string(data),
 		})
 	}
 
-	err = configMap.WriteTo(os.Stdout)
+	err = configMap.writeTo(os.Stdout)
 	if err != nil {
 		app.FatalIfError(err, "%v", err)
 	}
@@ -71,19 +71,19 @@ func genConfigMap(app *kingpin.Application, configDir, configMapName string) {
 
 type ConfigMap struct {
 	Name  string
-	Files []File
+	Files []ConfigMapFile
 }
 
-type File struct {
+type ConfigMapFile struct {
 	Name  string
 	Value string
 }
 
-func (c *ConfigMap) WriteTo(w io.Writer) error {
-	return tmpl.Execute(w, c)
+func (c *ConfigMap) writeTo(w io.Writer) error {
+	return configMapTmpl.Execute(w, c)
 }
 
-var nameRE = regexp.MustCompile(`^\.?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
+var nameConfigMapRE = regexp.MustCompile(`^\.?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
 
 // kind: ConfigMap
 // apiVersion: v1
@@ -96,7 +96,7 @@ var nameRE = regexp.MustCompile(`^\.?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-
 //     property.1=value-1
 //     property.2=value-2
 //     property.3=value-3
-var tmpl = template.Must(template.New("").Funcs(template.FuncMap{
+var configMapTmpl = template.Must(template.New("").Funcs(template.FuncMap{
 	"indent": indent,
 }).Parse(`kind: ConfigMap
 apiVersion: v1
diff --git a/cmd/k8s/gen_secretmap.go b/cmd/k8s/gen_secretmap.go
index 473f2cf..7f49ef1 100644
--- a/cmd/k8s/gen_secretmap.go
+++ b/cmd/k8s/gen_secretmap.go
@@ -43,8 +43,8 @@ func genSecretMap(app *kingpin.Application, secretDir, secretMapName string) {
 		if name == ".DS_Store" {
 			continue
 		}
-		if len(name) > 253 || !nameRE.MatchString(name) {
-			app.Fatalf("%q must have at most 253 characters and match regex %s", name, nameRE.String())
+		if len(name) > 253 || !nameSecretMapRE.MatchString(name) {
+			app.Fatalf("%q must have at most 253 characters and match regex %s", name, nameSecretMapRE.String())
 		}
 
 		data, err := ioutil.ReadFile(path)
@@ -57,13 +57,13 @@ func genSecretMap(app *kingpin.Application, secretDir, secretMapName string) {
 			app.FatalIfError(err, "%v", err)
 		}
 
-		secretMap.Files = append(secretMap.Files, File{
+		secretMap.Files = append(secretMap.Files, SecretMapFile{
 			Name:  name,
 			Value: string(data),
 		})
 	}
 
-	err = secretMap.WriteTo(os.Stdout)
+	err = secretMap.writeTo(os.Stdout)
 	if err != nil {
 		app.FatalIfError(err, "%v", err)
 	}
@@ -71,19 +71,19 @@ func genSecretMap(app *kingpin.Application, secretDir, secretMapName string) {
 
 type SecretMap struct {
 	Name  string
-	Files []File
+	Files []SecretMapFile
 }
 
-type File struct {
+type SecretMapFile struct {
 	Name  string
 	Value string
 }
 
-func (c *SecretMap) WriteTo(w io.Writer) error {
-	return tmpl.Execute(w, c)
+func (c *SecretMap) writeTo(w io.Writer) error {
+	return secretMapTmpl.Execute(w, c)
 }
 
-var nameRE = regexp.MustCompile(`^\.?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
+var nameSecretMapRE = regexp.MustCompile(`^\.?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
 
 // kind: SecretMap
 // apiVersion: v1
@@ -96,7 +96,7 @@ var nameRE = regexp.MustCompile(`^\.?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-
 //     property.1=value-1
 //     property.2=value-2
 //     property.3=value-3
-var tmpl = template.Must(template.New("").Funcs(template.FuncMap{
+var secretMapTmpl = template.Must(template.New("").Funcs(template.FuncMap{
 	"b64": b64,
 }).Parse(`kind: Secret
 apiVersion: v1