From c1729925161cb187f0720cf276098b13edd4c88c Mon Sep 17 00:00:00 2001
From: chatton <cianhatton@gmail.com>
Date: Wed, 9 Sep 2020 12:37:19 +0100
Subject: [PATCH 1/2] fixed incorrect arg parse options for release

---
 cmd/testrunner/main.go       |  1 +
 scripts/dev/release_image.py | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/cmd/testrunner/main.go b/cmd/testrunner/main.go
index 21b1d113a..966d79d92 100644
--- a/cmd/testrunner/main.go
+++ b/cmd/testrunner/main.go
@@ -15,6 +15,7 @@ import (
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/client"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/pod"
+
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/cmd/testrunner/crds"
diff --git a/scripts/dev/release_image.py b/scripts/dev/release_image.py
index d6e4fcd1d..f6cba715d 100644
--- a/scripts/dev/release_image.py
+++ b/scripts/dev/release_image.py
@@ -3,6 +3,10 @@
 import sys
 import argparse
 
+ALLOWED_RELEASE_OPTIONS = frozenset(
+    ["mongodb-kubernetes-operator", "version-upgrade-hook"]
+)
+
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser()
@@ -35,7 +39,7 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--image_type",
         help="Type of image to be released",
-        choices=["mongodb-kubernetes-operator", "version-upgrade-hook"],
+        choices=ALLOWED_RELEASE_OPTIONS,
     )
     args = parser.parse_args()
 
@@ -47,18 +51,15 @@ def main() -> int:
     with open(args.release_file) as f:
         release = json.load(f)
 
-    if args.image_type == "operator":
-        new_tag = release["mongodb-kubernetes-operator"]
-    elif args.image_type == "versionhook":
-        new_tag = release["version-upgrade-hook"]
-    else:
-        print(f"Image type{args.image_type} is not supported by the release script!")
+    if args.image_type not in ALLOWED_RELEASE_OPTIONS:
+        print(f"Image type {args.image_type} is not supported by the release script!")
         return 1
+
     dockerutil.retag_image(
         args.old_repo_url,
         args.new_repo_url,
         args.old_tag,
-        new_tag,
+        release[args.image_type],
         args.path,
         args.labels,
         args.username,

From 458da54729bc26bf8c5c8137fabe88d6f4c00607 Mon Sep 17 00:00:00 2001
From: chatton <cianhatton@gmail.com>
Date: Wed, 9 Sep 2020 12:37:28 +0100
Subject: [PATCH 2/2] fixed incorrect arg parse options for release

---
 cmd/testrunner/main.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmd/testrunner/main.go b/cmd/testrunner/main.go
index 966d79d92..21b1d113a 100644
--- a/cmd/testrunner/main.go
+++ b/cmd/testrunner/main.go
@@ -15,7 +15,6 @@ import (
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/client"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/pod"
-
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/cmd/testrunner/crds"