update code for dynamic storage

Author: Jeff McCormick

Makefile

@@ -17,8 +17,8 @@ pgo:	check-go-vars
 	cd client && go build -o $(GOBIN)/pgo pgo.go
 clean:	check-go-vars
 	rm -rf $(GOPATH)/pkg/* $(GOBIN)/*
-	go get -u github.com/FiloSottile/gvt
-	gvt restore
+	go get github.com/tools/godep
+	godep restore
 operatorimage:	check-go-vars
 	cd operator && go install postgres-operator.go
 	cp $(GOBIN)/postgres-operator bin/postgres-operator

client/cmd/root.go

@@ -166,11 +166,13 @@ func validateConfig() {
 		os.Exit(2)
 	}
 
+	/**
 	if viper.GetString("MASTER_STORAGE.STORAGE_TYPE") == "dynamic" ||
 		viper.GetString("REPLICA_STORAGE.STORAGE_TYPE") == "dynamic" {
 		log.Error("STORAGE_TYPE dynamic is not supported yet")
 		os.Exit(2)
 	}
+	*/
 
 	rep := viper.GetString("CLUSTER.REPLICAS")
 	if rep != "" {

operator/cluster/cluster.go

@@ -372,7 +372,7 @@ func createPVC(clientset *kubernetes.Clientset, name string, storageSpec *tpr.Pg
 	case "existing":
 		log.Debug("StorageType is existing")
 		pvcName = storageSpec.PvcName
-	case "create":
+	case "create", "dynamic":
 		log.Debug("StorageType is create")
 		pvcName = name + "-pvc"
 		log.Debug("PVC_NAME=%s PVC_SIZE=%s PVC_ACCESS_MODE=%s\n",
@@ -383,8 +383,6 @@ func createPVC(clientset *kubernetes.Clientset, name string, storageSpec *tpr.Pg
 			return pvcName, err
 		}
 		log.Info("created PVC =" + pvcName + " in namespace " + namespace)
-	case "dynamic":
-		log.Debug("StorageType is dynamic, not supported yet")
 	}
 
 	return pvcName, err

operator/cluster/cluster_strategy_1.go

@@ -125,20 +125,22 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 	if err != nil {
 		log.Error("could not convert REPLICAS config setting")
 	} else {
-		//create the replica service
-		serviceName := cl.Spec.Name + "-replica"
-		repserviceFields := ServiceTemplateFields{
-			Name:        serviceName,
-			ClusterName: cl.Spec.Name,
-			Port:        cl.Spec.Port,
-		}
+		if newReplicas > 0 {
+			//create the replica service
+			serviceName := cl.Spec.Name + "-replica"
+			repserviceFields := ServiceTemplateFields{
+				Name:        serviceName,
+				ClusterName: cl.Spec.Name,
+				Port:        cl.Spec.Port,
+			}
 
-		err = CreateService(clientset, &repserviceFields, namespace)
-		if err != nil {
-			log.Error("error in creating replica service " + err.Error())
-			return err
+			err = CreateService(clientset, &repserviceFields, namespace)
+			if err != nil {
+				log.Error("error in creating replica service " + err.Error())
+				return err
+			}
+			ScaleReplicas(serviceName, clientset, cl, newReplicas, namespace)
 		}
-		ScaleReplicas(serviceName, clientset, cl, newReplicas, namespace)
 	}
 
 	return err
@@ -429,9 +431,8 @@ func (r ClusterStrategy1) CreateReplica(serviceName string, clientset *kubernete
 	switch cl.Spec.ReplicaStorage.StorageType {
 	case "", "emptydir":
 		log.Debug("MasterStorage.StorageType is emptydir")
-		log.Debug("using the dynamic replica template ")
 		err = ReplicaDeploymentTemplate1.Execute(&replicaDoc, replicaDeploymentFields)
-	case "existing", "create":
+	case "existing", "create", "dynamic":
 		log.Debug("using the shared replica template ")
 		err = ReplicaDeploymentTemplate1Shared.Execute(&replicaDoc, replicaDeploymentFields)
 	}