fix scale command to allow --service-type to take precedent over the cluster service-type or the pgo.yaml service type

jmccormick2001 · jmccormick2001 · commit 331ca486a080 · 2018-11-25T17:19:58.000-05:00
diff --git a/operator/cluster/cluster.go b/operator/cluster/cluster.go
@@ -406,7 +406,9 @@ func ScaleBase(clientset *kubernetes.Clientset, client *rest.RESTClient, replica
 
 	st := operator.Pgo.Cluster.ServiceType
 
-	if cluster.Spec.UserLabels[util.LABEL_SERVICE_TYPE] != "" {
+	if replica.Spec.UserLabels[util.LABEL_SERVICE_TYPE] != "" {
+		st = replica.Spec.UserLabels[util.LABEL_SERVICE_TYPE]
+	} else if cluster.Spec.UserLabels[util.LABEL_SERVICE_TYPE] != "" {
 		st = cluster.Spec.UserLabels[util.LABEL_SERVICE_TYPE]
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,9 @@ func ScaleBase(clientset kubernetes.Clientset, client rest.RESTClient, replica`
`406`	`406`
`407`	`407`	`st := operator.Pgo.Cluster.ServiceType`
`408`	`408`
`409`		`- if cluster.Spec.UserLabels[util.LABEL_SERVICE_TYPE] != "" {`
	`409`	`+ if replica.Spec.UserLabels[util.LABEL_SERVICE_TYPE] != "" {`
	`410`	`+ st = replica.Spec.UserLabels[util.LABEL_SERVICE_TYPE]`
	`411`	`+ } else if cluster.Spec.UserLabels[util.LABEL_SERVICE_TYPE] != "" {`
`410`	`412`	`st = cluster.Spec.UserLabels[util.LABEL_SERVICE_TYPE]`
`411`	`413`	`}`
`412`	`414`