Remove lots of unnecessary params

Author: durera

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

@@ -65,20 +65,13 @@ spec:
     - name: storage_class_rwo
       value: "{{ storage_class_rwo }}"
 
-{%- if turbonomic_server_url is defined and turbonomic_server_url != "" %}
-
-    # Dependencies - Turbonomic
+    # MAS Catalog
     # -------------------------------------------------------------------------
-    - name: turbonomic_server_url
-      value: "{{ turbonomic_server_url }}"
-    - name: turbonomic_server_version
-      value: "{{ turbonomic_server_version }}"
-    - name: turbonomic_target_name
-      value: "{{ turbonomic_target_name }}"
-    - name: turbonomic_username
-      value: "{{ turbonomic_username }}"
-    - name: turbonomic_password
-      value: "{{ turbonomic_password }}"
+    - name: mas_catalog_version
+      value: "{{ mas_catalog_version }}"
+{%- if mas_catalog_digest is defined and mas_catalog_digest != "" %}
+    - name: mas_catalog_digest
+      value: "{{ mas_catalog_digest }}"
 {%- endif %}
 
 {%- if mongodb_action is defined and mongodb_action != "" %}
@@ -136,7 +129,19 @@ spec:
     - name: sls_action
       value: "{{ sls_action }}"
 {%- endif %}
+{%- if aiservice_sls_url is defined and aiservice_sls_url != "" %}
 
+    # Remote SLS
+    # -------------------------------------------------------------------------
+    - name: aiservice_sls_secret_name
+      value: "{{ aiservice_sls_secret_name }}"
+    - name: aiservice_sls_registration_key
+      value: "{{ aiservice_sls_registration_key }}"
+    - name: aiservice_sls_url
+      value: "{{ aiservice_sls_url }}"
+    - name: aiservice_sls_ca_cert
+      value: "{{ aiservice_sls_ca_cert }}"
+{%- endif %}
 
     # Dependencies - UDS/DRO (Required)
     # -------------------------------------------------------------------------
@@ -153,168 +158,30 @@ spec:
       value: "{{ dro_namespace }}"
 {%- endif %}
 
-    # MAS Catalog
-    # -------------------------------------------------------------------------
-    - name: mas_catalog_version
-      value: "{{ mas_catalog_version }}"
-{%- if mas_catalog_digest is defined and mas_catalog_digest != "" %}
-    - name: mas_catalog_digest
-      value: "{{ mas_catalog_digest }}"
-{%- endif %}
-
     # Dependencies - Certificate Manager
     # -------------------------------------------------------------------------
     - name: cert_manager_provider
       value: "{{ cert_manager_provider }}"
     - name: cert_manager_action
       value: "{{ cert_manager_action }}"
-{%- if dns_provider is defined and dns_provider != "" %}
-
-    # MAS DNS Integrations - General
-    # -------------------------------------------------------------------------
-    - name: dns_provider
-      value: "{{ dns_provider }}"
-  {%- if cloudflare_apitoken is defined and cloudflare_apitoken != "" %}
-
-    # MAS DNS Integrations - Cloudflare Support
-    # -------------------------------------------------------------------------
-    - name: cloudflare_email
-      value: "{{ cloudflare_email }}"
-    - name: cloudflare_apitoken
-      value: "{{ cloudflare_apitoken }}"
-    - name: cloudflare_zone
-      value: "{{ cloudflare_zone }}"
-    - name: cloudflare_subdomain
-      value: "{{ cloudflare_subdomain }}"
-  {%- endif %}
-  {%- if cis_apikey is defined and cis_apikey != "" %}
-
-    # MAS DNS Integrations - CIS Support
-    # -------------------------------------------------------------------------
-    - name: cis_email
-      value: "{{ cis_email }}"
-    - name: cis_apikey
-      value: "{{ cis_apikey }}"
-    - name: cis_crn
-      value: "{{ cis_crn }}"
-    - name: cis_subdomain
-      value: "{{ cis_subdomain }}"
-  {%- endif %}
-  {%- if cis_service_name is defined and cis_service_name != "" %}
-
-    # MAS DNS Integrations - CIS Security Enhancement Support
-    # -------------------------------------------------------------------------
-    - name: cis_service_name
-      value: "{{ cis_service_name }}"
-    - name: cis_enhanced_security
-      value: "{{ cis_enhanced_security }}"
-    - name: override_edge_certs
-      value: "{{ override_edge_certs }}"
-    - name: cis_proxy
-      value: "{{ cis_proxy }}"
-  {%- endif %}
-{%- endif %}
-{%- if aws_access_key_id is defined and aws_access_key_id != "" %}
-
-    # AWS basic info
-    # -------------------------------------------------------------------------
-    - name: aws_access_key_id
-      value: "{{ aws_access_key_id }}"
-    - name: aws_secret_access_key
-      value: "{{ aws_secret_access_key }}"
-    - name: aws_region
-      value: "{{ aws_region }}"
-{%- endif %}
-{%- if route53_hosted_zone_name is defined and route53_hosted_zone_name != "" %}
-
-    # MAS DNS Integrations - AWS Route 53
-    # -------------------------------------------------------------------------
-    - name: route53_hosted_zone_name
-      value: "{{ route53_hosted_zone_name }}"
-    - name: route53_hosted_zone_region
-      value: "{{ route53_hosted_zone_region }}"
-    - name: route53_email
-      value: "{{ route53_email }}"
-    - name: route53_subdomain
-      value: "{{ route53_subdomain }}"
-{%- endif %}
-{%- if mas_add_catalog is defined and mas_add_catalog != "" %}
 
-    # Data Dictionary
+    # Dependencies - Db2
     # -------------------------------------------------------------------------
-    - name: mas_add_catalog
-      value: "{{ mas_add_catalog }}"
-    - name: mas_add_channel
-      value: "{{ mas_add_channel }}"
-{%- endif %}
+    - name: db2_action_aiservice
+      value: "{{ db2_action_aiservice }}"
 
-    # Common params
+    # AI Service
     # -------------------------------------------------------------------------
+    - name: mas_app_channel_aibroker
+      value: "{{ mas_app_channel_aibroker }}"
+    - name: environment_type
+      value: "{{ environment_type }}"
     - name: aiservice_instance_id
       value: "{{ aiservice_instance_id }}"
     - name: mas_icr_cp
       value: "{{ mas_icr_cp }}"
     - name: mas_icr_cpopen
       value: "{{ mas_icr_cpopen }}"
-{%- if mas_trust_default_cas is defined and mas_trust_default_cas != "" %}
-    - name: mas_trust_default_cas
-      value: "{{ mas_trust_default_cas }}"
-{%- endif %}
-{%- if mas_manual_cert_mgmt is defined %}
-    - name: mas_manual_cert_mgmt
-      value: "{{ mas_manual_cert_mgmt }}"
-{%- endif %}
-
-{%- if mas_app_channel_aibroker is defined and mas_app_channel_aibroker != "" %}
-
-    # AI Broker
-    # -------------------------------------------------------------------------
-    - name: mas_app_channel_aibroker
-      value: "{{ mas_app_channel_aibroker }}"
-    - name: install_minio_aiservice
-      value: "{{ install_minio_aiservice }}"
-    - name: install_mongo_aiservice
-      value: "{{ install_mongo_aiservice }}"
-    - name: install_sls_aiservice
-      value: "{{ install_sls_aiservice }}"
-    - name: install_dro_aiservice
-      value: "{{ install_dro_aiservice }}"
-    - name: install_db2_aiservice
-      value: "{{ install_db2_aiservice }}"
-    - name: aiservice_dro_secret_name
-      value: "{{ aiservice_dro_secret_name }}"
-    - name: aiservice_dro_api_key
-      value: "{{ aiservice_dro_api_key }}"
-    - name: aiservice_dro_url
-      value: "{{ aiservice_dro_url }}"
-    - name: aiservice_dro_ca_cert
-      value: "{{ aiservice_dro_ca_cert }}"
-    - name: aiservice_db2_username
-      value: "{{ aiservice_db2_username }}"
-    - name: aiservice_db2_password
-      value: "{{ aiservice_db2_password }}"
-    - name: aiservice_db2_jdbc_url
-      value: "{{ aiservice_db2_jdbc_url }}"
-    - name: aiservice_db2_ssl_enabled
-      value: "{{ aiservice_db2_ssl_enabled }}"
-    - name: aiservice_db2_ca_cert
-      value: "{{ aiservice_db2_ca_cert }}"
-    - name: aiservice_sls_secret_name
-      value: "{{ aiservice_sls_secret_name }}"
-    - name: aiservice_sls_registration_key
-      value: "{{ aiservice_sls_registration_key }}"
-    - name: aiservice_sls_url
-      value: "{{ aiservice_sls_url }}"
-    - name: aiservice_sls_ca_cert
-      value: "{{ aiservice_sls_ca_cert }}"
-    - name: environment_type
-      value: "{{ environment_type }}"
-
-  {%- if install_db2_aiservice is defined and install_db2_aiservice == "false" %}
-    - name: db2_action_aiservice
-      value: "not_install"
-  {%- endif %}
-
 
     # AI Service Tenant
     # -------------------------------------------------------------------------
@@ -334,22 +201,25 @@ spec:
       value: "{{ aiservice_tenant_s3_access_key }}"
     - name: aiservice_tenant_s3_secret_key
       value: "{{ aiservice_tenant_s3_secret_key }}"
+
+    # RSL
+    # -------------------------------------------------------------------------
     - name: rsl_url
       value: "{{ rsl_url }}"
     - name: rsl_org_id
       value: "{{ rsl_org_id }}"
     - name: rsl_token
       value: "{{ rsl_token }}"
+
+    # S3 Buckets
+    # -------------------------------------------------------------------------
     - name: aiservice_s3_bucket_prefix
       value: "{{ aiservice_s3_bucket_prefix }}"
     - name: aiservice_s3_region
       value: "{{ aiservice_s3_region }}"
     - name: aiservice_s3_endpoint_url
       value: "{{ aiservice_s3_endpoint_url }}"
 
-{%- endif %}
-{%- if aiservice_storage_provider is defined and aiservice_storage_provider != "" %}
-
     # AI Service - OpenData Hub Storage
     # -------------------------------------------------------------------------
     - name: aiservice_storage_provider
@@ -366,36 +236,22 @@ spec:
       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_tenant_name
       value: "{{ aiservice_tenant_name }}"
+
     - name: minio_root_user
       value: "{{ minio_root_user }}"
     - name: minio_root_password
       value: "{{ minio_root_password }}"
 
-{%- endif %}
-{%- if aiservice_controller_tag is defined and aiservice_controller_tag != "" %}
-
-    # AI Service - KModels Tags
-    # -------------------------------------------------------------------------
-    - name: aiservice_controller_tag
-      value: "{{ aiservice_controller_tag }}"
-    - name: aiservice_store_tag
-      value: "{{ aiservice_store_tag }}"
-    - name: aiservice_watcher_tag
-      value: "{{ aiservice_watcher_tag }}"
-    - name: aiservice_connector_tag
-      value: "{{ aiservice_connector_tag }}"
-    - name: aiservice_pipeline_steps_tag
-      value: "{{ aiservice_pipeline_steps_tag }}"
-{%- endif %}
-{%- if aiservice_watsonxai_apikey is defined and aiservice_watsonxai_apikey != "" %}
 
     # AI Service - watsonX
     # -------------------------------------------------------------------------
@@ -407,7 +263,7 @@ spec:
       value: "{{ aiservice_watsonxai_project_id }}"
     - name: aiservice_watsonx_action
       value: "{{ aiservice_watsonx_action }}"
-{%- endif %}
+
 {%- if aiservice_s3_action is defined and aiservice_s3_action != "" %}
 
     # AI Service - S3

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

@@ -112,6 +112,8 @@ spec:
       value: "{{ db2_action_system }}"
     - name: db2_action_manage
       value: "{{ db2_action_manage }}"
+    - name: db2_action_facilities
+      value: "{{ db2_action_facilities}}"
 
     # Dependencies - Db2u Operator
     # -------------------------------------------------------------------------
@@ -769,9 +771,6 @@ spec:
       value: "{{ mas_ws_facilities_config_map_name }}"
 {%- endif %}
 
-    - name: db2_action_facilities
-      value: "{{ db2_action_facilities}}"
-
 {%- endif %}
 
   workspaces: