Merge pull request #317 from abhinavdahiya/skip_job_on_init

openshift-merge-robot · web-flow · commit 2afd105d0291 · 2020-02-17T22:00:46.000+01:00
bug 1794817: lib/resourcebuilder/batch.go: skip waiting for job to complete when in Init mode
diff --git a/lib/resourcebuilder/batch.go b/lib/resourcebuilder/batch.go
@@ -20,6 +20,7 @@ type jobBuilder struct {
 	client   *batchclientv1.BatchV1Client
 	raw      []byte
 	modifier MetaV1ObjectModifierFunc
+	mode     Mode
 }
 
 func newJobBuilder(config *rest.Config, m lib.Manifest) Interface {
@@ -30,6 +31,7 @@ func newJobBuilder(config *rest.Config, m lib.Manifest) Interface {
 }
 
 func (b *jobBuilder) WithMode(m Mode) Interface {
+	b.mode = m
 	return b
 }
 
@@ -47,7 +49,7 @@ func (b *jobBuilder) Do(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	if updated {
+	if updated && b.mode != InitializingMode {
 		return WaitForJobCompletion(ctx, b.client, job)
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ type jobBuilder struct {`
`20`	`20`	`client *batchclientv1.BatchV1Client`
`21`	`21`	`raw []byte`
`22`	`22`	`modifier MetaV1ObjectModifierFunc`
	`23`	`+ mode Mode`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`func newJobBuilder(config *rest.Config, m lib.Manifest) Interface {`
`@@ -30,6 +31,7 @@ func newJobBuilder(config *rest.Config, m lib.Manifest) Interface {`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`func (b *jobBuilder) WithMode(m Mode) Interface {`
	`34`	`+ b.mode = m`
`33`	`35`	`return b`
`34`	`36`	`}`
`35`	`37`
`@@ -47,7 +49,7 @@ func (b *jobBuilder) Do(ctx context.Context) error {`
`47`	`49`	`if err != nil {`
`48`	`50`	`return err`
`49`	`51`	`}`
`50`		`- if updated {`
	`52`	`+ if updated && b.mode != InitializingMode {`
`51`	`53`	`return WaitForJobCompletion(ctx, b.client, job)`
`52`	`54`	`}`
`53`	`55`	`return nil`