Enable gzip compression when unpacking bundles to ConfigMap

Signed-off-by: Zvi Cahana <zvic@il.ibm.com>
operator-framework · Jul 15, 2021 · fd34447 · fd34447
1 parent f87b076
commit fd34447
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
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,