diff --git a/bundle/manifests/multicluster-engine.clusterserviceversion.yaml b/bundle/manifests/multicluster-engine.clusterserviceversion.yaml index 3adec378e..0e88e69db 100644 --- 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 index 7c26919d2..4cdbe36d7 100644 --- 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 index 68f2c99c0..0a470175c 100644 --- 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):