tweeks for strategies code

Author: Jeff McCormick

client/cmd/cluster.go

@@ -168,6 +168,7 @@ func getClusterParams(name string) *tpr.PgCluster {
 		REPLICAS:            "2",
 		FS_GROUP:            "",
 		SUPPLEMENTAL_GROUPS: "",
+		STRATEGY:            "1",
 	}
 
 	//override any values from config file
@@ -215,10 +216,6 @@ func getClusterParams(name string) *tpr.PgCluster {
 	if str != "" {
 		spec.PG_ROOT_PASSWORD = str
 	}
-	str = viper.GetString("CLUSTER.REPLICAS")
-	if str != "" {
-		spec.REPLICAS = str
-	}
 	str = viper.GetString("DB.FSGROUP")
 	if str != "" {
 		spec.FS_GROUP = str
@@ -227,6 +224,14 @@ func getClusterParams(name string) *tpr.PgCluster {
 	if str != "" {
 		spec.SUPPLEMENTAL_GROUPS = str
 	}
+	str = viper.GetString("CLUSTER.STRATEGY")
+	if str != "" {
+		spec.STRATEGY = str
+	}
+	str = viper.GetString("CLUSTER.REPLICAS")
+	if str != "" {
+		spec.REPLICAS = str
+	}
 
 	//override from command line
 

client/cmd/database.go

@@ -121,6 +121,7 @@ func getDatabaseParams(name string) *tpr.PgDatabase {
 		BACKUP_PATH:         "",
 		FS_GROUP:            "",
 		SUPPLEMENTAL_GROUPS: "",
+		STRATEGY:            "1",
 	}
 
 	//override any values from config file
@@ -176,6 +177,10 @@ func getDatabaseParams(name string) *tpr.PgDatabase {
 	if str != "" {
 		spec.SUPPLEMENTAL_GROUPS = str
 	}
+	str = viper.GetString("DB.STRATEGY")
+	if str != "" {
+		spec.STRATEGY = str
+	}
 
 	//pass along command line flags for a restore
 	spec.BACKUP_PATH = BackupPath

examples/sample.pgo.yaml

@@ -13,10 +13,11 @@ DB:
   PVC_ACCESS_MODE:  ReadWriteMany
   FSGROUP:  26
   SUPPLEMENTALGROUPS:  65534
+  STRATEGY:  1
 PGO:
   LSPVC_TEMPLATE:  /home/jeffmc/.pgo.lspvc-template.json
   CO_IMAGE_TAG:  centos7-1.0.0
   DEBUG:  false
 CLUSTER:
   REPLICAS:  2
-  STRATEGY:  default
+  STRATEGY:  1

operator/cluster/cluster.go

@@ -63,10 +63,14 @@ type DeploymentTemplateFields struct {
 
 const REPLICA_SUFFIX = "-replica"
 
-var strategy1 ClusterStrategy
+var strategyMap map[string]ClusterStrategy
+
+//var strategy1 ClusterStrategy
 
 func init() {
-	strategy1 = ClusterStrategy1{}
+	//strategy1 = ClusterStrategy1{}
+	strategyMap = make(map[string]ClusterStrategy)
+	strategyMap["1"] = ClusterStrategy1{}
 }
 
 func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan chan struct{}) {
@@ -118,7 +122,6 @@ func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan
 
 func addCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, db *tpr.PgCluster) {
 	var err error
-	var strategy ClusterStrategy
 
 	//create the PVC for the master if required
 	if db.Spec.PVC_NAME == "" {
@@ -132,26 +135,38 @@ func addCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, db *tp
 		}
 		log.Info("created PVC =" + db.Spec.PVC_NAME)
 	}
-	log.Debug("creating PgCluster object " + db.Spec.STRATEGY)
+	log.Debug("creating PgCluster object strategy is [" + db.Spec.STRATEGY + "]")
+
+	if db.Spec.STRATEGY == "" {
+		db.Spec.STRATEGY = "1"
+		log.Info("using default strategy")
+	}
 
-	if db.Spec.STRATEGY == "1" || db.Spec.STRATEGY == "" {
-		strategy = strategy1
+	strategy, ok := strategyMap[db.Spec.STRATEGY]
+	if ok {
+		log.Info("strategy found")
 	} else {
 		log.Error("invalid STRATEGY requested for cluster creation" + db.Spec.STRATEGY)
+		return
 	}
+
 	strategy.AddCluster(clientset, client, db)
 
 }
 
 func deleteCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, db *tpr.PgCluster) {
-	var strategy ClusterStrategy
 
 	log.Debug("deleteCluster called with strategy " + db.Spec.STRATEGY)
 
-	if db.Spec.STRATEGY == "1" || db.Spec.STRATEGY == "" {
-		strategy = strategy1
+	if db.Spec.STRATEGY == "" {
+		db.Spec.STRATEGY = "1"
+	}
+
+	strategy, ok := strategyMap[db.Spec.STRATEGY]
+	if ok {
+		log.Info("strategy found")
 	} else {
-		log.Error("invalid STRATEGY requested cluster deletion " + db.Spec.STRATEGY)
+		log.Error("invalid STRATEGY requested for cluster creation" + db.Spec.STRATEGY)
 		return
 	}
 	strategy.DeleteCluster(clientset, client, db)

operator/database/database.go

@@ -56,10 +56,12 @@ type DatabaseStrategy interface {
 	DeleteDatabase(*kubernetes.Clientset, *rest.RESTClient, *tpr.PgDatabase) error
 }
 
-var strategy1 DatabaseStrategy
+var strategyMap map[string]DatabaseStrategy
 
 func init() {
-	strategy1 = DatabaseStrategy1{}
+	strategyMap = make(map[string]DatabaseStrategy)
+	strategyMap["1"] = DatabaseStrategy1{}
+
 }
 
 func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan chan struct{}) {
@@ -127,23 +129,40 @@ func addDatabase(clientset *kubernetes.Clientset, client *rest.RESTClient, db *t
 
 	log.Debug("creating PgDatabase object " + db.Spec.STRATEGY)
 
-	if db.Spec.STRATEGY == "1" || db.Spec.STRATEGY == "" {
-		strategy = strategy1
+	if db.Spec.STRATEGY == "" {
+		db.Spec.STRATEGY = "1"
+		log.Info("using default strategy")
+	}
+
+	strategy, ok := strategyMap[db.Spec.STRATEGY]
+	if ok {
+		log.Info("strategy found")
+
 	} else {
 		log.Error("invalid STRATEGY requested for Database creation" + db.Spec.STRATEGY)
 		return
 	}
+
 	strategy.AddDatabase(clientset, client, db)
 
 }
 
 func deleteDatabase(clientset *kubernetes.Clientset, client *rest.RESTClient, db *tpr.PgDatabase) {
 	log.Debug("deleting PgDatabase object with strategy " + db.Spec.STRATEGY)
 
-	if db.Spec.STRATEGY == "1" || db.Spec.STRATEGY == "" {
-		strategy1.DeleteDatabase(clientset, client, db)
+	if db.Spec.STRATEGY == "" {
+		db.Spec.STRATEGY = "1"
+		log.Info("using default strategy")
+	}
+
+	strategy, ok := strategyMap[db.Spec.STRATEGY]
+	if ok {
+		log.Info("strategy found")
 	} else {
-		log.Error("invalid STRATEGY requested Database deletion " + db.Spec.STRATEGY)
+		log.Error("invalid STRATEGY requested for database creation" + db.Spec.STRATEGY)
+		return
 	}
 
+	strategy.DeleteDatabase(clientset, client, db)
+
 }