Merge pull request #1715 from dinhxuanvu/fix-stale-bundle

openshift-merge-robot · web-flow · commit 63a809b03d27 · 2020-08-11T15:14:12.000-04:00
Bug 1867169: Fix stale content in configmap due to stale bundle image in the node
diff --git a/pkg/controller/bundle/bundle_unpacker.go b/pkg/controller/bundle/bundle_unpacker.go
@@ -106,9 +106,10 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 							},
 						},
 						{
-							Name:    "pull",
-							Image:   bundlePath,
-							Command: []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
+							Name:            "pull",
+							Image:           bundlePath,
+							ImagePullPolicy: "Always",
+							Command:         []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
 							VolumeMounts: []corev1.VolumeMount{
 								{
 									Name:      "bundle",
diff --git a/pkg/controller/bundle/bundle_unpacker_test.go b/pkg/controller/bundle/bundle_unpacker_test.go
@@ -226,9 +226,10 @@ func TestConfigMapUnpacker(t *testing.T) {
 											},
 										},
 										{
-											Name:    "pull",
-											Image:   bundlePath,
-											Command: []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
+											Name:            "pull",
+											Image:           bundlePath,
+											ImagePullPolicy: "Always",
+											Command:         []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
 											VolumeMounts: []corev1.VolumeMount{
 												{
 													Name:      "bundle",
@@ -382,9 +383,10 @@ func TestConfigMapUnpacker(t *testing.T) {
 											},
 										},
 										{
-											Name:    "pull",
-											Image:   bundlePath,
-											Command: []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
+											Name:            "pull",
+											Image:           bundlePath,
+											ImagePullPolicy: "Always",
+											Command:         []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
 											VolumeMounts: []corev1.VolumeMount{
 												{
 													Name:      "bundle",
@@ -577,9 +579,10 @@ func TestConfigMapUnpacker(t *testing.T) {
 											},
 										},
 										{
-											Name:    "pull",
-											Image:   bundlePath,
-											Command: []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
+											Name:            "pull",
+											Image:           bundlePath,
+											ImagePullPolicy: "Always",
+											Command:         []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount
 											VolumeMounts: []corev1.VolumeMount{
 												{
 													Name:      "bundle",

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,10 @@ func (c ConfigMapUnpacker) job(cmRef corev1.ObjectReference, bundlePath string`
`106`	`106`	`},`
`107`	`107`	`},`
`108`	`108`	`{`
`109`		`- Name: "pull",`
`110`		`- Image: bundlePath,`
`111`		`- Command: []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount`
	`109`	`+ Name: "pull",`
	`110`	`+ Image: bundlePath,`
	`111`	`+ ImagePullPolicy: "Always",`
	`112`	`+ Command: []string{"/util/cpb", "/bundle"}, // Copy bundle content to its mount`
`112`	`113`	`VolumeMounts: []corev1.VolumeMount{`
`113`	`114`	`{`
`114`	`115`	`Name: "bundle",`