update

Author: Jeff McCormick

operator/cluster/cluster_strategy_1.go

@@ -23,7 +23,6 @@ import (
 	"encoding/json"
 
 	log "github.com/Sirupsen/logrus"
-	"io/ioutil"
 	"text/template"
 
 	"github.com/crunchydata/postgres-operator/operator/util"
@@ -43,33 +42,10 @@ var ReplicaDeploymentTemplate1 *template.Template
 var ServiceTemplate1 *template.Template
 
 func init() {
-	var err error
-	var buf []byte
-	var SERVICE_PATH_1 = "/pgconf/postgres-operator/cluster/1/cluster-service.json"
-	var DEPLOYMENT_PATH_1 = "/pgconf/postgres-operator/cluster/1/cluster-deployment.json"
-	var REPLICA_DEPLOYMENT_PATH_1 = "/pgconf/postgres-operator/cluster/1/cluster-replica-deployment.json"
-
-	buf, err = ioutil.ReadFile(DEPLOYMENT_PATH_1)
-	if err != nil {
-		log.Error(err.Error())
-		panic(err.Error())
-	}
-	DeploymentTemplate1 = template.Must(template.New("deployment1 template").Parse(string(buf)))
-
-	buf, err = ioutil.ReadFile(REPLICA_DEPLOYMENT_PATH_1)
-	if err != nil {
-		log.Error(err.Error())
-		panic(err.Error())
-	}
-	ReplicaDeploymentTemplate1 = template.Must(template.New("replica1 deployment template").Parse(string(buf)))
-
-	buf, err = ioutil.ReadFile(SERVICE_PATH_1)
-	if err != nil {
-		log.Error(err.Error())
-		panic(err.Error())
-	}
 
-	ServiceTemplate1 = template.Must(template.New("service1 template").Parse(string(buf)))
+	ServiceTemplate1 = util.LoadTemplate("/pgconf/postgres-operator/cluster/1/cluster-service.json")
+	ReplicaDeploymentTemplate1 = util.LoadTemplate("/pgconf/postgres-operator/cluster/1/cluster-replica-deployment.json")
+	DeploymentTemplate1 = util.LoadTemplate("/pgconf/postgres-operator/cluster/1/cluster-deployment.json")
 }
 
 func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, db *tpr.PgCluster) error {

operator/database/database_strategy_1.go

@@ -19,7 +19,6 @@ import (
 	"bytes"
 	"encoding/json"
 	log "github.com/Sirupsen/logrus"
-	"io/ioutil"
 	"text/template"
 
 	"github.com/crunchydata/postgres-operator/operator/pvc"
@@ -39,33 +38,11 @@ var RestorePodTemplate1 *template.Template
 var ServiceTemplate1 *template.Template
 
 func init() {
-	var err error
-	var buf []byte
-	var SERVICE_PATH = "/pgconf/postgres-operator/database/1/database-service.json"
-	var POD_PATH = "/pgconf/postgres-operator/database/1/database-pod.json"
-	var RESTORE_POD_PATH = "/pgconf/postgres-operator/database/1/restore-database-pod.json"
-
-	buf, err = ioutil.ReadFile(POD_PATH)
-	if err != nil {
-		log.Error(err.Error())
-		panic(err.Error())
-	}
-	PodTemplate1 = template.Must(template.New("pod1 template").Parse(string(buf)))
-
-	buf, err = ioutil.ReadFile(RESTORE_POD_PATH)
-	if err != nil {
-		log.Error(err.Error())
-		panic(err.Error())
-	}
-	RestorePodTemplate1 = template.Must(template.New("restore1 pod template").Parse(string(buf)))
 
-	buf, err = ioutil.ReadFile(SERVICE_PATH)
-	if err != nil {
-		log.Error(err.Error())
-		panic(err.Error())
-	}
+	ServiceTemplate1 = util.LoadTemplate("/pgconf/postgres-operator/database/1/database-service.json")
+	PodTemplate1 = util.LoadTemplate("/pgconf/postgres-operator/database/1/database-pod.json")
+	RestorePodTemplate1 = util.LoadTemplate("/pgconf/postgres-operator/database/1/restore-database-pod.json")
 
-	ServiceTemplate1 = template.Must(template.New("service1 template").Parse(string(buf)))
 }
 
 // database consists of a Service and a Pod

operator/util/util.go

@@ -17,6 +17,9 @@ package util
 
 import (
 	"bytes"
+	log "github.com/Sirupsen/logrus"
+	"io/ioutil"
+	"text/template"
 )
 
 func CreateSecContext(FS_GROUP string, SUPP string) string {
@@ -53,3 +56,13 @@ func CreateSecContext(FS_GROUP string, SUPP string) string {
 
 	return sc.String()
 }
+
+func LoadTemplate(path string) *template.Template {
+	buf, err := ioutil.ReadFile(path)
+	if err != nil {
+		log.Error(err.Error())
+		panic(err.Error())
+	}
+	return template.Must(template.New(path).Parse(string(buf)))
+
+}