fix upgrade logic for storage changes

Author: Jeff McCormick

client/cmd/upgrade.go

@@ -203,7 +203,6 @@ func createUpgrade(args []string) {
 			fmt.Println("cluster " + arg + " uses emptydir storage and can not be upgraded")
 			break
 		}
-		fmt.Println("after break")
 
 		// Create an instance of our TPR
 		newInstance, err = getUpgradeParams(arg)

conf/postgres-operator/cluster/1/cluster-upgrade-job-1.json

@@ -25,9 +25,9 @@
                         "claimName": "{{.NEW_PVC_NAME}}"
                     }
                 }],
-                "securityContext": {
-                    "supplementalGroups": [65534]
-                },
+
+		{{.SECURITY_CONTEXT}}
+
                 "containers": [{
                     "name": "upgrade",
                     "image": "crunchydata/crunchy-upgrade:{{.CCP_IMAGE_TAG}}",

docs/config.asciidoc

@@ -163,6 +163,7 @@ the *.pgo.yaml* configuration file by specifying values within
 the REPLICA_STORAGE, MASTER_STORAGE, and BACKUP_STORAGE settings.
 
 The following STORAGE_TYPE values are possible:
+
  * *dynamic* - currently not implemented, this will allow for dynamic
  provisioning of storage using a StorageClass
  * *existing* - this setting allows you to use a PVC that already exists,

operator/cluster/cluster_strategy_1.go

@@ -238,9 +238,14 @@ func shutdownCluster(clientset *kubernetes.Clientset, client *rest.RESTClient, c
 	//in the delete options to also delete the replica sets
 
 	//delete the deployments
+	delOptions := meta_v1.DeleteOptions{}
+	var delProp meta_v1.DeletionPropagation
+	delProp = meta_v1.DeletePropagationForeground
+	delOptions.PropagationPolicy = &delProp
+
 	for _, d := range deployments.Items {
 		log.Debug("deleting deployment " + d.ObjectMeta.Name)
-		err = clientset.ExtensionsV1beta1().Deployments(namespace).Delete(d.ObjectMeta.Name, &meta_v1.DeleteOptions{})
+		err = clientset.ExtensionsV1beta1().Deployments(namespace).Delete(d.ObjectMeta.Name, &delOptions)
 		if err != nil {
 			log.Error("error deleting replica Deployment " + err.Error())
 		}

operator/cluster/upgrade_strategy_1.go

@@ -44,6 +44,7 @@ type JobTemplateFields struct {
 	NEW_DATABASE_NAME string
 	OLD_VERSION       string
 	NEW_VERSION       string
+	SECURITY_CONTEXT  string
 }
 
 const DB_UPGRADE_JOB_PATH = "/operator-conf/cluster-upgrade-job-1.json"
@@ -127,30 +128,20 @@ func (r ClusterStrategy1) MajorUpgrade(clientset *kubernetes.Clientset, tprclien
 	}
 
 	//create the PVC if necessary
-	if upgrade.Spec.NEW_PVC_NAME != upgrade.Spec.OLD_PVC_NAME {
-		if pvc.Exists(clientset, upgrade.Spec.NEW_PVC_NAME, namespace) {
-			log.Info("pvc " + upgrade.Spec.NEW_PVC_NAME + " already exists, will not create")
-		} else {
-			log.Info("creating pvc " + upgrade.Spec.NEW_PVC_NAME)
-			err = pvc.Create(clientset, upgrade.Spec.NEW_PVC_NAME, upgrade.Spec.StorageSpec.PvcAccessMode, upgrade.Spec.StorageSpec.PvcSize, upgrade.Spec.StorageSpec.StorageType, upgrade.Spec.StorageSpec.StorageClass, namespace)
-			if err != nil {
-				log.Error("error in pvc create " + err.Error())
-				return err
-			}
-			log.Info("created PVC =" + upgrade.Spec.NEW_PVC_NAME + " in namespace " + namespace)
-		}
-	}
+	pvcName, err := pvc.CreatePVC(clientset, cl.Spec.Name+"-upgrade", &cl.Spec.MasterStorage, namespace)
+	log.Debug("created pvc for upgrade as [" + pvcName + "]")
 
 	//upgrade the master data
 	jobFields := JobTemplateFields{
 		Name:              upgrade.Spec.Name,
-		NEW_PVC_NAME:      upgrade.Spec.NEW_PVC_NAME,
+		NEW_PVC_NAME:      pvcName,
 		OLD_PVC_NAME:      upgrade.Spec.OLD_PVC_NAME,
 		CCP_IMAGE_TAG:     upgrade.Spec.CCP_IMAGE_TAG,
 		OLD_DATABASE_NAME: upgrade.Spec.OLD_DATABASE_NAME,
 		NEW_DATABASE_NAME: upgrade.Spec.NEW_DATABASE_NAME,
 		OLD_VERSION:       upgrade.Spec.OLD_VERSION,
 		NEW_VERSION:       upgrade.Spec.NEW_VERSION,
+		SECURITY_CONTEXT:  util.CreateSecContext(cl.Spec.MasterStorage.FSGROUP, cl.Spec.MasterStorage.SUPPLEMENTAL_GROUPS),
 	}
 
 	var doc bytes.Buffer
@@ -176,6 +167,13 @@ func (r ClusterStrategy1) MajorUpgrade(clientset *kubernetes.Clientset, tprclien
 	}
 	log.Info("created Job " + resultJob.Name)
 
+	//patch the upgrade tpr with the new pvc name
+	err = util.Patch(tprclient, "/spec/newpvcname", pvcName, tpr.UPGRADE_RESOURCE, upgrade.Spec.Name, namespace)
+	if err != nil {
+		log.Error(err)
+		return err
+	}
+
 	//the remainder of the major upgrade is done via the upgrade watcher
 
 	return err