Set API workflow to succeeded and not running once min replicas are met (#449)

deliahu · web-flow · commit 46def8b6ca3e · 2019-09-11T09:50:22.000-07:00
diff --git a/pkg/operator/workloads/api_workload.go b/pkg/operator/workloads/api_workload.go
@@ -147,8 +147,7 @@ func (aw *APIWorkload) IsSucceeded(ctx *context.Context) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	requestedReplicas := getRequestedReplicasFromDeployment(api, k8sDeployment, nil)
-	if updatedReplicas < requestedReplicas {
+	if updatedReplicas < api.Compute.MinReplicas {
 		return false, nil
 	}
 
@@ -175,8 +174,7 @@ func (aw *APIWorkload) IsRunning(ctx *context.Context) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	requestedReplicas := getRequestedReplicasFromDeployment(api, k8sDeployment, nil)
-	if updatedReplicas < requestedReplicas {
+	if updatedReplicas < api.Compute.MinReplicas {
 		return true, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ func (aw APIWorkload) IsSucceeded(ctx context.Context) (bool, error) {`
`147`	`147`	`if err != nil {`
`148`	`148`	`return false, err`
`149`	`149`	`}`
`150`		`- requestedReplicas := getRequestedReplicasFromDeployment(api, k8sDeployment, nil)`
`151`		`- if updatedReplicas < requestedReplicas {`
	`150`	`+ if updatedReplicas < api.Compute.MinReplicas {`
`152`	`151`	`return false, nil`
`153`	`152`	`}`
`154`	`153`
`@@ -175,8 +174,7 @@ func (aw APIWorkload) IsRunning(ctx context.Context) (bool, error) {`
`175`	`174`	`if err != nil {`
`176`	`175`	`return false, err`
`177`	`176`	`}`
`178`		`- requestedReplicas := getRequestedReplicasFromDeployment(api, k8sDeployment, nil)`
`179`		`- if updatedReplicas < requestedReplicas {`
	`177`	`+ if updatedReplicas < api.Compute.MinReplicas {`
`180`	`178`	`return true, nil`
`181`	`179`	`}`
`182`	`180`