GetCondition func fix (#114)

* GetCondition func fix * v1beta1 fix
kubeflow · Dec 19, 2018 · ebf3318 · ebf3318
1 parent d3c6541
commit ebf3318
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkg/controller.v1beta1/pytorch/status.go b/pkg/controller.v1beta1/pytorch/status.go
@@ -158,8 +158,10 @@ func newCondition(conditionType common.JobConditionType, reason, message string)
 
 // getCondition returns the condition with the provided type.
 func getCondition(status common.JobStatus, condType common.JobConditionType) *common.JobCondition {
-	if len(status.Conditions) > 0 {
-		return &status.Conditions[len(status.Conditions)-1]
+	for _, condition := range status.Conditions {
+		if condition.Type == condType {
+			return &condition
+		}
 	}
 	return nil
 }

diff --git a/pkg/controller.v2/pytorch/status.go b/pkg/controller.v2/pytorch/status.go
@@ -154,8 +154,10 @@ func newCondition(conditionType v1alpha2.PyTorchJobConditionType, reason, messag
 
 // getCondition returns the condition with the provided type.
 func getCondition(status v1alpha2.PyTorchJobStatus, condType v1alpha2.PyTorchJobConditionType) *v1alpha2.PyTorchJobCondition {
-	if len(status.Conditions) > 0 {
-		return &status.Conditions[len(status.Conditions)-1]
+	for _, condition := range status.Conditions {
+		if condition.Type == condType {
+			return &condition
+		}
 	}
 	return nil
 }