add logic to not create backups or clusters on restart of operator

Author: Jeff McCormick

operator/backup/backup.go

@@ -113,6 +113,12 @@ func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan
 
 func addBackup(clientset *kubernetes.Clientset, client *rest.RESTClient, job *tpr.PgBackup, namespace string) {
 	var err error
+
+	if job.Spec.BACKUP_STATUS == tpr.UPGRADE_COMPLETED_STATUS {
+		log.Warn("pgbackup " + job.Spec.Name + " already completed, not recreating it")
+		return
+	}
+
 	log.Info("creating PgBackup object" + " in namespace " + namespace)
 	log.Info("created with Name=" + job.Spec.Name + " in namespace " + namespace)
 

operator/cluster/cluster.go

@@ -95,18 +95,20 @@ func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan
 		deleteCluster(clientset, client, cluster, namespace)
 	}
 
+	/**
 	updateHandler := func(old interface{}, obj interface{}) {
 		cluster := obj.(*tpr.PgCluster)
 		eventchan <- cluster
+		log.Info("updateHandler called")
 	}
+	*/
 
 	_, controller := cache.NewInformer(
 		source,
 		&tpr.PgCluster{},
 		time.Second*10,
 		cache.ResourceEventHandlerFuncs{
 			AddFunc:    createAddHandler,
-			UpdateFunc: updateHandler,
 			DeleteFunc: createDeleteHandler,
 		})
 
@@ -126,6 +128,11 @@ func Process(clientset *kubernetes.Clientset, client *rest.RESTClient, stopchan
 func addCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *tpr.PgCluster, namespace string) {
 	var err error
 
+	if cl.Spec.STATUS == tpr.UPGRADE_COMPLETED_STATUS {
+		log.Warn("tpr pgcluster " + cl.Spec.ClusterName + " is already marked complete, will not recreate")
+		return
+	}
+
 	//create the PVC for the master if required
 	if cl.Spec.PVC_NAME == "" {
 		cl.Spec.PVC_NAME = cl.Spec.Name + "-pvc"
@@ -174,6 +181,11 @@ func addCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, cl *tp
 
 	strategy.AddCluster(clientset, client, cl, namespace)
 
+	err = util.Patch(client, "/spec/status", tpr.UPGRADE_COMPLETED_STATUS, "pgclusters", cl.Spec.Name, namespace)
+	if err != nil {
+		log.Error("error in status patch " + err.Error())
+	}
+
 }
 
 func setFullVersion(tprclient *rest.RESTClient, cl *tpr.PgCluster, namespace string) {

operator/cluster/cluster_strategy_1.go

@@ -125,7 +125,7 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 		Port:                 cl.Spec.Port,
 		CCP_IMAGE_TAG:        cl.Spec.CCP_IMAGE_TAG,
 		PVC_NAME:             cl.Spec.PVC_NAME,
-		OPERATOR_LABELS:      util.GetLabels(cl.Spec.Name, cl.Spec.ClusterName, false),
+		OPERATOR_LABELS:      util.GetLabels(cl.Spec.Name, cl.Spec.ClusterName, false, false),
 		BACKUP_PVC_NAME:      util.CreateBackupPVCSnippet(cl.Spec.BACKUP_PVC_NAME),
 		BACKUP_PATH:          cl.Spec.BACKUP_PATH,
 		PGDATA_PATH_OVERRIDE: cl.Spec.Name,
@@ -172,7 +172,7 @@ func (r ClusterStrategy1) AddCluster(clientset *kubernetes.Clientset, client *re
 		PG_MASTER_HOST:       cl.Spec.PG_MASTER_HOST,
 		PG_DATABASE:          cl.Spec.PG_DATABASE,
 		REPLICAS:             cl.Spec.REPLICAS,
-		OPERATOR_LABELS:      util.GetLabels(cl.Spec.Name, cl.Spec.ClusterName, false),
+		OPERATOR_LABELS:      util.GetLabels(cl.Spec.Name, cl.Spec.ClusterName, false, true),
 		SECURITY_CONTEXT:     util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
 		PGROOT_SECRET_NAME:   cl.Spec.PGROOT_SECRET_NAME,
 		PGMASTER_SECRET_NAME: cl.Spec.PGMASTER_SECRET_NAME,
@@ -352,7 +352,7 @@ func (r ClusterStrategy1) PrepareClone(clientset *kubernetes.Clientset, tprclien
 		PVC_NAME:             cl.Spec.PVC_NAME,
 		PG_MASTER_HOST:       cl.Spec.PG_MASTER_HOST,
 		PG_DATABASE:          cl.Spec.PG_DATABASE,
-		OPERATOR_LABELS:      util.GetLabels(cloneName, cloneName, true),
+		OPERATOR_LABELS:      util.GetLabels(cloneName, cloneName, true, false),
 		REPLICAS:             "1",
 		SECURITY_CONTEXT:     util.CreateSecContext(cl.Spec.FS_GROUP, cl.Spec.SUPPLEMENTAL_GROUPS),
 		PGROOT_SECRET_NAME:   cl.Spec.PGROOT_SECRET_NAME,

operator/util/util.go

@@ -173,11 +173,14 @@ func ScaleDeployment(clientset *kubernetes.Clientset, deploymentName, namespace
 	return err
 }
 
-func GetLabels(name, clustername string, clone bool) string {
+func GetLabels(name, clustername string, clone, replica bool) string {
 	var output string
 	if clone {
 		output += fmt.Sprintf("\"clone\": \"%s\",\n", "true")
 	}
+	if replica {
+		output += fmt.Sprintf("\"replica\": \"%s\",\n", "true")
+	}
 	output += fmt.Sprintf("\"name\": \"%s\",\n", name)
 	output += fmt.Sprintf("\"pg-cluster\": \"%s\"\n", clustername)
 	return output

tpr/cluster.go

@@ -51,6 +51,7 @@ type PgClusterSpec struct {
 	PGUSER_SECRET_NAME    string `json:"pgusersecretname"`
 	PGROOT_SECRET_NAME    string `json:"pgrootsecretname"`
 	PGMASTER_SECRET_NAME  string `json:"pgmastersecretname"`
+	STATUS                string `json:"status"`
 }
 
 type PgCluster struct {