Enable gzip compression when unpacking bundles to ConfigMap

zcahana · zcahana · commit fd344476b1d0 · 2021-07-15T14:56:55.000+03:00
Signed-off-by: Zvi Cahana &lt;zvic@il.ibm.com&gt;
diff --git a/pkg/controller/bundle/bundle_unpacker.go b/pkg/controller/bundle/bundle_unpacker.go
@@ -100,9 +100,14 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
 					ImagePullSecrets: secrets,
 					Containers: []corev1.Container{
 						{
-							Name:    "extract",
-							Image:   c.opmImage,
-							Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", cmRef.Namespace, "-c", cmRef.Name},
+							Name:  "extract",
+							Image: c.opmImage,
+							Command: []string{"opm", "alpha", "bundle", "extract",
+								"-m", "/bundle/",
+								"-n", cmRef.Namespace,
+								"-c", cmRef.Name,
+								"-z",
+							},
 							Env: []corev1.EnvVar{
 								{
 									Name:  configmap.EnvContainerImage,
diff --git a/pkg/controller/bundle/bundle_unpacker_test.go b/pkg/controller/bundle/bundle_unpacker_test.go
@@ -222,7 +222,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										{
 											Name:    "extract",
 											Image:   opmImage,
-											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},
+											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},
 											Env: []corev1.EnvVar{
 												{
 													Name:  configmap.EnvContainerImage,
@@ -399,7 +399,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										{
 											Name:    "extract",
 											Image:   opmImage,
-											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},
+											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},
 											Env: []corev1.EnvVar{
 												{
 													Name:  configmap.EnvContainerImage,
@@ -616,7 +616,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										{
 											Name:    "extract",
 											Image:   opmImage,
-											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},
+											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},
 											Env: []corev1.EnvVar{
 												{
 													Name:  configmap.EnvContainerImage,
@@ -828,7 +828,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										{
 											Name:    "extract",
 											Image:   opmImage,
-											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},
+											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},
 											Env: []corev1.EnvVar{
 												{
 													Name:  configmap.EnvContainerImage,
@@ -1010,7 +1010,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										{
 											Name:    "extract",
 											Image:   opmImage,
-											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},
+											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},
 											Env: []corev1.EnvVar{
 												{
 													Name:  configmap.EnvContainerImage,
@@ -1203,7 +1203,7 @@ func TestConfigMapUnpacker(t *testing.T) {
 										{
 											Name:    "extract",
 											Image:   opmImage,
-											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},
+											Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},
 											Env: []corev1.EnvVar{
 												{
 													Name:  configmap.EnvContainerImage,

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ func TestConfigMapUnpacker(t *testing.T) {`
`222`	`222`	`{`
`223`	`223`	`Name: "extract",`
`224`	`224`	`Image: opmImage,`
`225`		`- Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},`
	`225`	`+ Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},`
`226`	`226`	`Env: []corev1.EnvVar{`
`227`	`227`	`{`
`228`	`228`	`Name: configmap.EnvContainerImage,`
`@@ -399,7 +399,7 @@ func TestConfigMapUnpacker(t *testing.T) {`
`399`	`399`	`{`
`400`	`400`	`Name: "extract",`
`401`	`401`	`Image: opmImage,`
`402`		`- Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},`
	`402`	`+ Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},`
`403`	`403`	`Env: []corev1.EnvVar{`
`404`	`404`	`{`
`405`	`405`	`Name: configmap.EnvContainerImage,`
`@@ -616,7 +616,7 @@ func TestConfigMapUnpacker(t *testing.T) {`
`616`	`616`	`{`
`617`	`617`	`Name: "extract",`
`618`	`618`	`Image: opmImage,`
`619`		`- Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},`
	`619`	`+ Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},`
`620`	`620`	`Env: []corev1.EnvVar{`
`621`	`621`	`{`
`622`	`622`	`Name: configmap.EnvContainerImage,`
`@@ -828,7 +828,7 @@ func TestConfigMapUnpacker(t *testing.T) {`
`828`	`828`	`{`
`829`	`829`	`Name: "extract",`
`830`	`830`	`Image: opmImage,`
`831`		`- Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},`
	`831`	`+ Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},`
`832`	`832`	`Env: []corev1.EnvVar{`
`833`	`833`	`{`
`834`	`834`	`Name: configmap.EnvContainerImage,`
`@@ -1010,7 +1010,7 @@ func TestConfigMapUnpacker(t *testing.T) {`
`1010`	`1010`	`{`
`1011`	`1011`	`Name: "extract",`
`1012`	`1012`	`Image: opmImage,`
`1013`		`- Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},`
	`1013`	`+ Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},`
`1014`	`1014`	`Env: []corev1.EnvVar{`
`1015`	`1015`	`{`
`1016`	`1016`	`Name: configmap.EnvContainerImage,`
`@@ -1203,7 +1203,7 @@ func TestConfigMapUnpacker(t *testing.T) {`
`1203`	`1203`	`{`
`1204`	`1204`	`Name: "extract",`
`1205`	`1205`	`Image: opmImage,`
`1206`		`- Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash},`
	`1206`	`+ Command: []string{"opm", "alpha", "bundle", "extract", "-m", "/bundle/", "-n", "ns-a", "-c", pathHash, "-z"},`
`1207`	`1207`	`Env: []corev1.EnvVar{`
`1208`	`1208`	`{`
`1209`	`1209`	`Name: configmap.EnvContainerImage,`