Merge pull request #11324 from Vincent056/no_prefix

OCP4: Add option to deploy profile without upstream prefix

utils/build_ds_container.py

@@ -42,6 +42,16 @@
         '--product and --debug flags.'),
     action='store_true',
     default=False)
+# with upstream prefix option as default
+parser.add_argument(
+    '-np', '--no-upstream-prefix',
+    help=(
+        'The prefix for bundle names. The default is "upstream" if not specified. '
+        'To disable prefix, use --no-upstream-prefix.',
+        'This option is ignored when building content in the cluster using '
+        '--build-in-cluster.'),
+    action='store_true',
+    default=False)
 parser.add_argument(
     '-i', '--push-content-image',
     help=(
@@ -221,7 +231,10 @@ def create_profile_bundles(products, content_image=None):
     """
     for product in products:
         content_file = 'ssg-' + product + '-ds.xml'
-        product_name = 'upstream-' + product
+        if args.no_upstream_prefix:
+            product_name = product
+        else:
+            product_name = 'upstream-' + product
         profile_bundle_update = {
             'apiVersion': 'compliance.openshift.io/v1alpha1',
             'kind': 'ProfileBundle',