[ACM-11365] Remove hubsize reference from CRD (#701)

* updated shell script for automation Signed-off-by: Disaiah Bennett <[email protected]> * Added Github Action job for regenerating oeprator SHA commits Signed-off-by: Disaiah Bennett <[email protected]> * removed hubSize from CRD Signed-off-by: Disaiah Bennett <[email protected]> * added exit code condition for shell script Signed-off-by: Disaiah Bennett <[email protected]> --------- Signed-off-by: Disaiah Bennett <[email protected]>
stolostron · May 9, 2024 · c747619 · c747619
1 parent 99e4c7e
commit c747619
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/bundle/manifests/multicluster-engine.clusterserviceversion.yaml b/bundle/manifests/multicluster-engine.clusterserviceversion.yaml
@@ -40,12 +40,6 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:advanced
         - urn:alm:descriptor:com.tectonic.ui:select:High
         - urn:alm:descriptor:com.tectonic.ui:select:Basic
-      - description: The resource allocation bucket for this hub to use. Small, Medium,
-          Large, XLarge]. Defaults to Small if not specified.
-        displayName: Hub Size
-        path: hubSize
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:hidden
       - description: Override pull secret for accessing MultiClusterEngine operand
           and endpoint images
         displayName: Image Pull Secret

diff --git a/bundle/manifests/multicluster.openshift.io_multiclusterengines.yaml b/bundle/manifests/multicluster.openshift.io_multiclusterengines.yaml
@@ -52,16 +52,6 @@ spec:
                 description: 'Specifies deployment replication for improved availability.
                   Options are: Basic and High (default)'
                 type: string
-              hubSize:
-                default: Small
-                description: The resource allocation bucket for this hub to use. Small,
-                  Medium, Large, XLarge]. Defaults to Small if not specified.
-                enum:
-                - Small
-                - Medium
-                - Large
-                - XLarge
-                type: string
               imagePullSecret:
                 description: Override pull secret for accessing MultiClusterEngine
                   operand and endpoint images

diff --git a/hack/bundle-automation/generate-shell.py b/hack/bundle-automation/generate-shell.py
@@ -8,6 +8,7 @@
 import os
 import logging
 import shutil
+import sys
 import time
 
 from git import Repo, exc
@@ -26,7 +27,10 @@ def clone_repository(repo_url, repo_path, branch='main'):
 
 def prepare_operation(script_dir, operation_script, operation_args):
     shutil.copy(os.path.join(os.path.dirname(os.path.realpath(__file__)), f"{script_dir}/{operation_script}"), os.path.join(os.path.dirname(os.path.realpath(__file__)), operation_script))
-    os.system("python3 " + os.path.dirname(os.path.realpath(__file__)) +  f"/{operation_script} {operation_args}")
+    exit_code = os.system("python3 " + os.path.dirname(os.path.realpath(__file__)) +  f"/{operation_script} {operation_args}")
+    if exit_code != 0:
+        sys.exit(1)
+
     os.remove(os.path.join(os.path.dirname(os.path.realpath(__file__)), f"{operation_script}"))
 
 def main(args):