Merge pull request #69 from ravisantoshgudimetla/fix-imagepull

openshift-merge-robot · web-flow · commit c68e8b1af270 · 2019-03-01T00:59:23.000-08:00
switch to pull if not present from always
diff --git a/bindata/v3.11.0/kube-scheduler/pod.yaml b/bindata/v3.11.0/kube-scheduler/pod.yaml
@@ -11,7 +11,7 @@ spec:
   containers:
   - name: scheduler
     image: ${IMAGE}
-    imagePullPolicy: Always
+    imagePullPolicy: IfNotPresent
     terminationMessagePolicy: FallbackToLogsOnError
     command: ["hyperkube", "kube-scheduler"]
     args:
diff --git a/manifests/0000_11_kube-scheduler-operator_06_deployment.yaml b/manifests/0000_11_kube-scheduler-operator_06_deployment.yaml
@@ -20,7 +20,7 @@ spec:
       containers:
       - name: kube-scheduler-operator-container
         image: docker.io/openshift/origin-cluster-kube-scheduler-operator:v4.0
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         command: ["cluster-kube-scheduler-operator", "operator"]
         args:
         - "--config=/var/run/configmaps/config/config.yaml"
diff --git a/pkg/operator/target_config_reconciler_v311_00.go b/pkg/operator/target_config_reconciler_v311_00.go
@@ -114,7 +114,6 @@ func manageKubeSchedulerConfigMap_v311_00_to_latest(lister corev1listers.ConfigM
 
 func managePod_v311_00_to_latest(client coreclientv1.ConfigMapsGetter, recorder events.Recorder, operatorConfig *operatorv1.KubeScheduler, imagePullSpec string) (*corev1.ConfigMap, bool, error) {
 	required := resourceread.ReadPodV1OrDie(v311_00_assets.MustAsset("v3.11.0/kube-scheduler/pod.yaml"))
-	required.Spec.Containers[0].ImagePullPolicy = corev1.PullAlways
 	if len(imagePullSpec) > 0 {
 		required.Spec.Containers[0].Image = imagePullSpec
 	}
diff --git a/pkg/operator/v311_00_assets/bindata.go b/pkg/operator/v311_00_assets/bindata.go

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ func manageKubeSchedulerConfigMap_v311_00_to_latest(lister corev1listers.ConfigM`
`114`	`114`
`115`	`115`	`func managePod_v311_00_to_latest(client coreclientv1.ConfigMapsGetter, recorder events.Recorder, operatorConfig operatorv1.KubeScheduler, imagePullSpec string) (corev1.ConfigMap, bool, error) {`
`116`	`116`	`required := resourceread.ReadPodV1OrDie(v311_00_assets.MustAsset("v3.11.0/kube-scheduler/pod.yaml"))`
`117`		`- required.Spec.Containers[0].ImagePullPolicy = corev1.PullAlways`
`118`	`117`	`if len(imagePullSpec) > 0 {`
`119`	`118`	`required.Spec.Containers[0].Image = imagePullSpec`
`120`	`119`	`}`