merge controller/podcontroller.go

Author: jmccormick2001

apis/cr/v1/backup.go

@@ -32,6 +32,7 @@ type PgbackupSpec struct {
 	BackupPass   string        `json:"backuppass"`
 	BackupPort   string        `json:"backupport"`
 	BackupStatus string        `json:"backupstatus"`
+	BackupPVC    string        `json:"backuppvc"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apis/cr/v1/deepcopy.go

@@ -16,6 +16,7 @@ func (in *Pgbackup) DeepCopyInto(out *Pgbackup) {
 		BackupPass:   in.Spec.BackupPass,
 		BackupPort:   in.Spec.BackupPort,
 		BackupStatus: in.Spec.BackupStatus,
+		BackupPVC:    in.Spec.BackupPVC,
 	}
 	out.Status = in.Status
 }

apis/cr/v1/task.go

@@ -22,8 +22,11 @@ import (
 // PgtaskResourcePlural ...
 const PgtaskResourcePlural = "pgtasks"
 
+const PgtaskDeleteBackups = "delete-backups"
 const PgtaskDeleteData = "delete-data"
 const PgtaskFailover = "failover"
+const PgtaskAutoFailover = "autofailover"
+const PgtaskAddPolicies = "addpolicies"
 
 // PgtaskSpec ...
 type PgtaskSpec struct {

apiserver.go

@@ -108,6 +108,7 @@ func main() {
 	r.HandleFunc("/backupsdelete/{name}", backupservice.DeleteBackupHandler).Methods("GET")
 	r.HandleFunc("/backups", backupservice.CreateBackupHandler).Methods("POST")
 	r.HandleFunc("/failover", failoverservice.CreateFailoverHandler).Methods("POST")
+	r.HandleFunc("/failover/{name}", failoverservice.QueryFailoverHandler).Methods("GET")
 
 	caCert, err := ioutil.ReadFile(serverCert)
 	if err != nil {

apiserver/backupservice/backupimpl.go

@@ -172,6 +172,10 @@ func CreateBackup(request *msgs.CreateBackupRequest) msgs.CreateBackupResponse {
 			resp.Results = append(resp.Results, msg)
 			break
 		}
+		if request.PVCName != "" {
+			log.Debug("jeff----> backuppvc is " + request.PVCName)
+			newInstance.Spec.BackupPVC = request.PVCName
+		}
 
 		err = kubeapi.Createpgbackup(apiserver.RESTClient, newInstance, apiserver.Namespace)
 		if err != nil {

apiserver/backupservice/backupservice.go

@@ -32,6 +32,11 @@ func ShowBackupHandler(w http.ResponseWriter, r *http.Request) {
 
 	backupname := vars["name"]
 
+	clientVersion := r.URL.Query().Get("version")
+	if clientVersion != "" {
+		log.Debug("version param was [" + clientVersion + "]")
+	}
+
 	err := apiserver.Authn(apiserver.SHOW_BACKUP_PERM, w, r)
 	if err != nil {
 		return
@@ -41,7 +46,14 @@ func ShowBackupHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
 	log.Debug("backupservice.ShowBackupHandler GET called")
-	resp := ShowBackup(backupname)
+	var resp msgs.ShowBackupResponse
+	if clientVersion != apiserver.VERSION {
+		resp = msgs.ShowBackupResponse{}
+		resp.Status = msgs.Status{Code: msgs.Error, Msg: apiserver.VERSION_MISMATCH_ERROR}
+
+	} else {
+		resp = ShowBackup(backupname)
+	}
 	json.NewEncoder(w).Encode(resp)
 
 }
@@ -53,6 +65,10 @@ func DeleteBackupHandler(w http.ResponseWriter, r *http.Request) {
 	log.Debugf("backupservice.DeleteBackupHandler %v\n", vars)
 
 	backupname := vars["name"]
+	clientVersion := r.URL.Query().Get("version")
+	if clientVersion != "" {
+		log.Debug("version param was [" + clientVersion + "]")
+	}
 
 	err := apiserver.Authn(apiserver.DELETE_BACKUP_PERM, w, r)
 	if err != nil {
@@ -62,7 +78,13 @@ func DeleteBackupHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
 	w.Header().Set("Content-Type", "application/json")
 	log.Debug("backupservice.DeleteBackupHandler called")
-	resp := DeleteBackup(backupname)
+	var resp msgs.DeleteBackupResponse
+	if clientVersion != apiserver.VERSION {
+		resp = msgs.DeleteBackupResponse{}
+		resp.Status = msgs.Status{Code: msgs.Error, Msg: apiserver.VERSION_MISMATCH_ERROR}
+	} else {
+		resp = DeleteBackup(backupname)
+	}
 	json.NewEncoder(w).Encode(resp)
 
 }

apiserver/clusterservice/clusterimpl.go

@@ -163,7 +163,7 @@ func ShowCluster(name, selector string) msgs.ShowClusterResponse {
 func getDeployments(cluster *crv1.Pgcluster) ([]msgs.ShowClusterDeployment, error) {
 	output := make([]msgs.ShowClusterDeployment, 0)
 
-	selector := "pg-cluster=" + cluster.Spec.Name
+	selector := util.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
 	deployments, err := kubeapi.GetDeployments(apiserver.Clientset, selector, apiserver.Namespace)
 	if err != nil {
 		return output, err
@@ -189,7 +189,7 @@ func getPods(cluster *crv1.Pgcluster) ([]msgs.ShowClusterPod, error) {
 
 	output := make([]msgs.ShowClusterPod, 0)
 
-	selector := "crunchy-pgpool!=true,pg-cluster=" + cluster.Spec.Name
+	selector := util.LABEL_PGPOOL + "!=true," + util.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
 
 	pods, err := kubeapi.GetPods(apiserver.Clientset, selector, apiserver.Namespace)
 	if err != nil {
@@ -216,7 +216,7 @@ func getPods(cluster *crv1.Pgcluster) ([]msgs.ShowClusterPod, error) {
 func getServices(cluster *crv1.Pgcluster) ([]msgs.ShowClusterService, error) {
 
 	output := make([]msgs.ShowClusterService, 0)
-	selector := "pg-cluster=" + cluster.Spec.Name
+	selector := util.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
 
 	services, err := kubeapi.GetServices(apiserver.Clientset, selector, apiserver.Namespace)
 	if err != nil {
@@ -238,7 +238,7 @@ func getServices(cluster *crv1.Pgcluster) ([]msgs.ShowClusterService, error) {
 func getSecrets(cluster *crv1.Pgcluster) ([]msgs.ShowClusterSecret, error) {
 
 	output := make([]msgs.ShowClusterSecret, 0)
-	selector := "pgpool!=true,pg-database=" + cluster.Spec.Name
+	selector := "pgpool!=true," + util.LABEL_PG_DATABASE + "=" + cluster.Spec.Name
 
 	secrets, err := kubeapi.GetSecrets(apiserver.Clientset, selector, apiserver.Namespace)
 	if err != nil {
@@ -303,17 +303,6 @@ func TestCluster(name, selector string) msgs.ClusterTestResponse {
 			return response
 		}
 
-		/**
-		//get the replicas for this cluster
-		log.Debug("calling getReplicas")
-		detail.Replicas, err = getReplicas(&c)
-		if err != nil {
-			response.Status.Code = msgs.Error
-			response.Status.Msg = err.Error()
-			return response
-		}
-		*/
-
 		//get the secrets for this cluster
 		detail.Secrets, err = getSecrets(&c)
 		if err != nil {
@@ -443,34 +432,37 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 		}
 
 		//set the metrics flag with the global setting first
-		userLabelsMap["crunchy_collect"] = strconv.FormatBool(apiserver.MetricsFlag)
+		userLabelsMap[util.LABEL_COLLECT] = strconv.FormatBool(apiserver.MetricsFlag)
 		if err != nil {
 			log.Error(err)
 		}
 
 		//if metrics is chosen on the pgo command, stick it into the user labels
 		if request.MetricsFlag {
-			userLabelsMap["crunchy_collect"] = "true"
+			userLabelsMap[util.LABEL_COLLECT] = "true"
+		}
+		if request.AutofailFlag {
+			userLabelsMap[util.LABEL_AUTOFAIL] = "true"
 		}
 
 		if request.ArchiveFlag {
-			userLabelsMap["archive"] = "true"
+			userLabelsMap[util.LABEL_ARCHIVE] = "true"
 			log.Debug("archive set to true in user labels")
 		} else {
 			log.Debug("using ArchiveMode from pgo.yaml")
-			userLabelsMap["archive"] = apiserver.Pgo.Cluster.ArchiveMode
+			userLabelsMap[util.LABEL_ARCHIVE] = apiserver.Pgo.Cluster.ArchiveMode
 		}
-		userLabelsMap["archive-timeout"] = apiserver.Pgo.Cluster.ArchiveTimeout
+		userLabelsMap[util.LABEL_ARCHIVE_TIMEOUT] = apiserver.Pgo.Cluster.ArchiveTimeout
 
 		if request.PgpoolFlag {
-			userLabelsMap["crunchy-pgpool"] = "true"
-			userLabelsMap["pgpool-secret"] = request.PgpoolSecret
+			userLabelsMap[util.LABEL_PGPOOL] = "true"
+			userLabelsMap[util.LABEL_PGPOOL_SECRET] = request.PgpoolSecret
 			log.Debug("userLabelsMap")
 			log.Debugf("%v", userLabelsMap)
 		}
 
 		if existsGlobalConfig() {
-			userLabelsMap["custom-config"] = util.GLOBAL_CUSTOM_CONFIGMAP
+			userLabelsMap[util.LABEL_CUSTOM_CONFIG] = util.GLOBAL_CUSTOM_CONFIGMAP
 		}
 
 		if request.StorageConfig != "" {
@@ -506,8 +498,8 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 				resp.Status.Msg = request.NodeLabel + " node label value was not valid .. check node labels for correct values to specify"
 				return resp
 			}
-			userLabelsMap["NodeLabelKey"] = parts[0]
-			userLabelsMap["NodeLabelValue"] = parts[1]
+			userLabelsMap[util.LABEL_NODE_LABEL_KEY] = parts[0]
+			userLabelsMap[util.LABEL_NODE_LABEL_VALUE] = parts[1]
 		}
 
 		if request.ReplicaStorageConfig != "" {
@@ -548,7 +540,7 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 
 		// Create an instance of our CRD
 		newInstance := getClusterParams(request, clusterName, userLabelsMap)
-		validateConfigPolicies(request.Policies)
+		validateConfigPolicies(clusterName, request.Policies)
 
 		t := time.Now()
 		newInstance.Spec.PswLastUpdate = t.Format(time.RFC3339)
@@ -566,18 +558,19 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 
 }
 
-func validateConfigPolicies(PoliciesFlag string) error {
+func validateConfigPolicies(clusterName, PoliciesFlag string) error {
 	var err error
 	var configPolicies string
+
 	if PoliciesFlag == "" {
-		log.Println(apiserver.Pgo.Cluster.Policies + " is Pgo.Cluster.Policies")
+		log.Debug(apiserver.Pgo.Cluster.Policies + " is Pgo.Cluster.Policies")
 		configPolicies = apiserver.Pgo.Cluster.Policies
 	} else {
 		configPolicies = PoliciesFlag
 	}
+
 	if configPolicies == "" {
-		log.Debug("no policies are specified")
-		err = errors.New("no policies are specified")
+		log.Debug("no policies are specified in either pgo.yaml or from user")
 		return err
 	}
 
@@ -598,8 +591,31 @@ func validateConfigPolicies(PoliciesFlag string) error {
 			log.Error("error getting pgpolicy " + v + err.Error())
 			return err
 		}
+		//create a pgtask to add the policy after the db is ready
+	}
+
+	spec := crv1.PgtaskSpec{}
+	spec.StorageSpec = crv1.PgStorageSpec{}
+	spec.TaskType = crv1.PgtaskAddPolicies
+	spec.Status = "requested"
+	spec.Parameters = make(map[string]string)
+	for _, v := range policies {
+		spec.Parameters[v] = v
+	}
+	spec.Name = clusterName + "-policies"
+	labels := make(map[string]string)
+	labels[util.LABEL_PG_CLUSTER] = clusterName
+
+	newInstance := &crv1.Pgtask{
+		ObjectMeta: meta_v1.ObjectMeta{
+			Name:   spec.Name,
+			Labels: labels,
+		},
+		Spec: spec,
 	}
 
+	kubeapi.Createpgtask(apiserver.RESTClient, newInstance, apiserver.Namespace)
+
 	return err
 }
 
@@ -718,7 +734,7 @@ func getClusterParams(request *msgs.CreateClusterRequest, name string, userLabel
 
 func validateSecretFrom(secretname string) error {
 	var err error
-	selector := "pg-database=" + secretname
+	selector := util.LABEL_PG_DATABASE + "=" + secretname
 	secrets, err := kubeapi.GetSecrets(apiserver.Clientset, selector, apiserver.Namespace)
 	if err != nil {
 		return err
@@ -730,8 +746,6 @@ func validateSecretFrom(secretname string) error {
 	pguserFound := false
 
 	for _, s := range secrets.Items {
-		//fmt.Println("")
-		//fmt.Println("secret : " + s.ObjectMeta.Name)
 		if s.ObjectMeta.Name == secretname+crv1.PrimarySecretSuffix {
 			pgprimaryFound = true
 		} else if s.ObjectMeta.Name == secretname+crv1.RootSecretSuffix {
@@ -790,9 +804,6 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 	log.Debug("got the cluster...")
 
 	for _, element := range pods {
-		//log.Debugf("the pod details ... %v\n", element)
-		//get the pgdata pvc for each pod
-
 		//create pgtask CRD
 		spec := crv1.PgtaskSpec{}
 		if element.Primary {
@@ -811,6 +822,9 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 			},
 			Spec: spec,
 		}
+		newInstance.ObjectMeta.Labels = make(map[string]string)
+		newInstance.ObjectMeta.Labels[util.LABEL_PG_CLUSTER] = clusterName
+		newInstance.ObjectMeta.Labels[util.LABEL_RMDATA] = "true"
 
 		err = kubeapi.Createpgtask(apiserver.RESTClient,
 			newInstance, apiserver.Namespace)
@@ -831,11 +845,12 @@ func createDeleteDataTasks(clusterName string, storageSpec crv1.PgStorageSpec, d
 		//proceed with backups removal
 		spec := crv1.PgtaskSpec{}
 		spec.Name = clusterName + "-backups"
-		spec.TaskType = crv1.PgtaskDeleteData
+		spec.TaskType = crv1.PgtaskDeleteBackups
 		spec.StorageSpec = storageSpec
 
 		spec.Parameters = make(map[string]string)
 		spec.Parameters[backupPVCName] = backupPVCName
+		spec.Parameters[util.LABEL_PG_CLUSTER] = clusterName
 
 		newInstance := &crv1.Pgtask{
 			ObjectMeta: meta_v1.ObjectMeta{
@@ -896,7 +911,7 @@ func getReplicas(cluster *crv1.Pgcluster) ([]msgs.ShowClusterReplica, error) {
 	output := make([]msgs.ShowClusterReplica, 0)
 	replicaList := crv1.PgreplicaList{}
 
-	selector := "pg-cluster=" + cluster.Spec.Name
+	selector := util.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
 
 	err := kubeapi.GetpgreplicasBySelector(apiserver.RESTClient,
 		&replicaList, selector, apiserver.Namespace)