Merge pull request #749 from oracle/introspect-job-imagepullpolicy-fix

rjeberhard · web-flow · commit 1b9e40b91b11 · 2019-01-08T09:05:49.000-05:00
get introspector job imagePullPolicy from domain resource (inste…
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java
@@ -266,7 +266,11 @@ String getImageName() {
   }
 
   String getImagePullPolicy() {
-    return KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;
+    String imagePullPolicy = getDomain().getSpec().getImagePullPolicy();
+    if (imagePullPolicy == null) {
+      imagePullPolicy = KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;
+    }
+    return imagePullPolicy;
   }
 
   protected List<String> getContainerCommand() {

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,11 @@ String getImageName() {`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`String getImagePullPolicy() {`
`269`		`- return KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;`
	`269`	`+ String imagePullPolicy = getDomain().getSpec().getImagePullPolicy();`
	`270`	`+ if (imagePullPolicy == null) {`
	`271`	`+ imagePullPolicy = KubernetesConstants.IFNOTPRESENT_IMAGEPULLPOLICY;`
	`272`	`+ }`
	`273`	`+ return imagePullPolicy;`
`270`	`274`	`}`
`271`	`275`
`272`	`276`	`protected List<String> getContainerCommand() {`