Merge remote-tracking branch 'origin/stable' into ibai

Author: IanBoden

.github/CODEOWNERS

@@ -1 +1 @@
-* @durera @sanjayprab @terenceq @whitfiea @ianBoden @rawa-resul @leo-miran
+* @durera @sanjayprab @terenceq @whitfiea @ianBoden @rawa-resul @leo-miran @terc1997

src/mas/devops/data/catalogs/v9-250828-amd64.yaml

@@ -136,4 +136,4 @@ cpd_product_version_default: 5.1.3
 
 # Extra Images for kmodels
 # ------------------------------------------------------------------------------
-kmodels_extras_version_default: 1.0.13
+kmodels_extras_version_default: 1.0.14

src/mas/devops/olm.py

@@ -40,7 +40,7 @@ def getPackageManifest(dynClient: DynamicClient, packageName: str, catalogSource
     return manifestResource
 
 
-def ensureOperatorGroupExists(dynClient: DynamicClient, env: Environment, namespace: str):
+def ensureOperatorGroupExists(dynClient: DynamicClient, env: Environment, namespace: str, installMode: str = "OwnNamespace"):
     # Create a new OperatorGroup if necessary
     operatorGroupsAPI = dynClient.resources.get(api_version="operators.coreos.com/v1", kind="OperatorGroup")
     operatorGroupList = operatorGroupsAPI.get(namespace=namespace)
@@ -49,7 +49,8 @@ def ensureOperatorGroupExists(dynClient: DynamicClient, env: Environment, namesp
         template = env.get_template("operatorgroup.yml.j2")
         renderedTemplate = template.render(
             name="operatorgroup",
-            namespace=namespace
+            namespace=namespace,
+            installMode=installMode
         )
         operatorGroup = yaml.safe_load(renderedTemplate)
         operatorGroupsAPI.apply(body=operatorGroup, namespace=namespace)
@@ -70,7 +71,7 @@ def getSubscription(dynClient: DynamicClient, namespace: str, packageName: str):
     return subscriptions.items[0]
 
 
-def applySubscription(dynClient: DynamicClient, namespace: str, packageName: str, packageChannel: str = None, catalogSource: str = None, catalogSourceNamespace: str = "openshift-marketplace", config: dict = None):
+def applySubscription(dynClient: DynamicClient, namespace: str, packageName: str, packageChannel: str = None, catalogSource: str = None, catalogSourceNamespace: str = "openshift-marketplace", config: dict = None, installMode: str = "OwnNamespace"):
     """
     Usage:
       createSubscription(dynClient, "testns1", "sub1", "ibm-sls")  # use default channel, & auto-detect CatalogSource
@@ -101,7 +102,7 @@ def applySubscription(dynClient: DynamicClient, namespace: str, packageName: str
     # Create the Namespace & OperatorGroup if necessary
     logger.debug(f"Setting up OperatorGroup in {namespace}")
     createNamespace(dynClient, namespace)
-    ensureOperatorGroupExists(dynClient, env, namespace)
+    ensureOperatorGroupExists(dynClient, env, namespace, installMode)
 
     # Create (or update) the subscription
     subscriptionsAPI = dynClient.resources.get(api_version="operators.coreos.com/v1alpha1", kind="Subscription")

src/mas/devops/templates/operatorgroup.yml.j2

@@ -5,6 +5,8 @@ metadata:
   name: {{ name }}
   namespace: {{ namespace }}
 spec:
+{%- if installMode != "AllNamespaces" %}
   targetNamespaces:
     - {{ namespace }}
+{%- endif %}
   upgradeStrategy: Default

src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2

@@ -193,16 +193,6 @@ spec:
       value: "{{ tenant_entitlement_start_date }}"
     - name: tenant_entitlement_end_date
       value: "{{ tenant_entitlement_end_date }}"
-    - name: aiservice_tenant_s3_bucket_prefix
-      value: "{{ aiservice_tenant_s3_bucket_prefix }}"
-    - name: aiservice_tenant_s3_region
-      value: "{{ aiservice_tenant_s3_region }}"
-    - name: aiservice_tenant_s3_endpoint_url
-      value: "{{ aiservice_tenant_s3_endpoint_url }}"
-    - name: aiservice_tenant_s3_access_key
-      value: "{{ aiservice_tenant_s3_access_key }}"
-    - name: aiservice_tenant_s3_secret_key
-      value: "{{ aiservice_tenant_s3_secret_key }}"
 
     # RSL
     # -------------------------------------------------------------------------
@@ -213,38 +203,27 @@ spec:
     - name: rsl_token
       value: "{{ rsl_token }}"
 
-    # S3 Buckets
+    # S3
     # -------------------------------------------------------------------------
-    - name: aiservice_s3_bucket_prefix
-      value: "{{ aiservice_s3_bucket_prefix }}"
+    - name: aiservice_s3_accesskey
+      value: "{{ aiservice_s3_accesskey }}"
+    - name: aiservice_s3_secretkey
+      value: "{{ aiservice_s3_secretkey }}"
+    - name: aiservice_s3_host
+      value: "{{ aiservice_s3_host }}"
+    - name: aiservice_s3_port
+      value: "{{ aiservice_s3_port }}"
+    - name: aiservice_s3_ssl
+      value: "{{ aiservice_s3_ssl }}"
     - name: aiservice_s3_region
       value: "{{ aiservice_s3_region }}"
-    - name: aiservice_s3_endpoint_url
-      value: "{{ aiservice_s3_endpoint_url }}"
+    - name: aiservice_s3_bucket_prefix
+      value: "{{ aiservice_s3_bucket_prefix }}"
 
-    # AI Service - OpenData Hub Storage
-    # -------------------------------------------------------------------------
-    - name: aiservice_storage_provider
-      value: "{{ aiservice_storage_provider }}"
-    - name: aiservice_storage_accesskey
-      value: "{{ aiservice_storage_accesskey }}"
-    - name: aiservice_storage_secretkey
-      value: "{{ aiservice_storage_secretkey }}"
-    - name: aiservice_storage_host
-      value: "{{ aiservice_storage_host }}"
-    - name: aiservice_storage_port
-      value: "{{ aiservice_storage_port }}"
-    - name: aiservice_storage_ssl
-      value: "{{ aiservice_storage_ssl }}"
-    - name: aiservice_storage_region
-      value: "{{ aiservice_storage_region }}"
-
-    - name: aiservice_storage_pipelines_bucket
-      value: "{{ aiservice_storage_pipelines_bucket }}"
-    - name: aiservice_storage_tenants_bucket
-      value: "{{ aiservice_storage_tenants_bucket }}"
-    - name: aiservice_storage_templates_bucket
-      value: "{{ aiservice_storage_templates_bucket }}"
+    - name: aiservice_s3_tenants_bucket
+      value: "{{ aiservice_s3_tenants_bucket }}"
+    - name: aiservice_s3_templates_bucket
+      value: "{{ aiservice_s3_templates_bucket }}"
 
     - name: minio_root_user
       value: "{{ minio_root_user }}"
@@ -263,16 +242,6 @@ spec:
     - name: aiservice_watsonx_action
       value: "{{ aiservice_watsonx_action }}"
 
-{%- if aiservice_s3_action is defined and aiservice_s3_action != "" %}
-
-    # AI Service - S3
-    # -------------------------------------------------------------------------
-    - name: aiservice_s3_action
-      value: "{{ aiservice_s3_action }}"
-    - name: aiservice_apikey_action
-      value: "{{ aiservice_apikey_action }}"
-{%- endif %}
-
   workspaces:
     # The generated configuration files
     # -------------------------------------------------------------------------

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -369,6 +369,8 @@ spec:
     # -------------------------------------------------------------------------
     - name: dns_provider
       value: "{{ dns_provider }}"
+    - name: ocp_ingress
+      value: "{{ ocp_ingress }}"
   {%- if cloudflare_apitoken is defined and cloudflare_apitoken != "" %}
 
     # MAS DNS Integrations - Cloudflare Support