Skip condition update when succeeded and bump tf-operator to v0.5.3 v…

…ersion (#44) * bump tf-operator to v0.5.3 version * Skip condition update when succeeded
kubeflow · Jun 10, 2019 · 6844634 · 6844634
1 parent a545803
commit 6844634
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -73,7 +73,7 @@ required = [
 
 [[override]]
   name = "github.com/kubeflow/tf-operator"
-  branch = "master"
+  version = "v0.5.3"
 
 [prune]
   go-tests = true

diff --git a/pkg/controller.v1/mxnet/status.go b/pkg/controller.v1/mxnet/status.go
@@ -214,8 +214,8 @@ func isFailed(status mxv1.MXJobStatus) bool {
 // If the condition that we are about to add already exists
 // and has the same status and reason then we are not going to update.
 func setCondition(status *mxv1.MXJobStatus, condition mxv1.MXJobCondition) {
-	// Do nothing if MXJobStatus have failed condition
-	if isFailed(*status) {
+	// Do nothing if MXJobStatus is completed
+	if isFailed(*status) || isSucceeded(*status) {
 		return
 	}
 

diff --git a/pkg/controller.v1beta1/mxnet/status.go b/pkg/controller.v1beta1/mxnet/status.go
@@ -201,8 +201,8 @@ func isFailed(status mxv1beta1.MXJobStatus) bool {
 // If the condition that we are about to add already exists
 // and has the same status and reason then we are not going to update.
 func setCondition(status *mxv1beta1.MXJobStatus, condition mxv1beta1.MXJobCondition) {
-	// Do nothing if MXJobStatus have failed condition
-	if isFailed(*status) {
+	// Do nothing if MXJobStatus is completed
+	if isFailed(*status) || isSucceeded(*status) {
 		return
 	}