fix bug in upgrade backup_pvc_name calculation

Jeff McCormick · Jeff McCormick · commit c7939cdc92bb · 2017-05-26T12:44:25.000-05:00
diff --git a/operator/cluster/upgrade_strategy_1.go b/operator/cluster/upgrade_strategy_1.go
@@ -66,9 +66,6 @@ func (r ClusterStrategy1) MinorUpgrade(clientset *kubernetes.Clientset, tprclien
 		log.Error("error in shutdownCluster " + err.Error())
 	}
 
-	if cl.Spec.BACKUP_PVC_NAME == "" {
-		cl.Spec.BACKUP_PVC_NAME = cl.Spec.Name + "-backup-pvc-empty"
-	}
 	//create the master deployment
 
 	deploymentFields := DeploymentTemplateFields{

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,6 @@ func (r ClusterStrategy1) MinorUpgrade(clientset *kubernetes.Clientset, tprclien`
`66`	`66`	`log.Error("error in shutdownCluster " + err.Error())`
`67`	`67`	`}`
`68`	`68`
`69`		`- if cl.Spec.BACKUP_PVC_NAME == "" {`
`70`		`- cl.Spec.BACKUP_PVC_NAME = cl.Spec.Name + "-backup-pvc-empty"`
`71`		`- }`
`72`	`69`	`//create the master deployment`
`73`	`70`
`74`	`71`	`deploymentFields := DeploymentTemplateFields{`