Merge branch 'main' of https://github.com/sassoftware/viya4-deployment into pr-pscloud-64

Author: Abhishek Kumar

docs/CONFIG-VARS.md

@@ -157,6 +157,7 @@ When V4_CFG_MANAGE_STORAGE is set to `true`, the `sas` and `pg-storage` storage
 | :--- | ---: | ---: | ---: | ---: | ---: | ---: |
 | V4_CFG_SAS_API_KEY | SAS API Key| string | | true | [API credentials](https://developer.sas.com/guides/sas-viya-orders.html) can be obtained from the [SAS API Portal](https://apiportal.sas.com/get-started) | viya |
 | V4_CFG_SAS_API_SECRET | SAS API Secret | string | | true | [API credentials](https://developer.sas.com/guides/sas-viya-orders.html) can be obtained from the [SAS API Portal](https://apiportal.sas.com/get-started) | viya |
+| V4_CFG_REPOSITORY_WAREHOUSE | Repository warehouse endpoint override | string | | false | Use `https://ses.sas.com` if your enterprise firewall or proxy blocks `ses.sas.download` due to certificate trust policies. This is passed as `--repository-warehouse` flag to the sas-orchestration container during deployment. | viya |
 
 ## Container Registry Access
 

examples/ansible-vars-iac.yaml

@@ -14,6 +14,8 @@ V4_CFG_SAS_API_SECRET: <api_client_secret>
 V4_CFG_ORDER_NUMBER: <order_number>
 V4_CFG_CADENCE_NAME: <cadence_name> # [lts|stable]
 V4_CFG_CADENCE_VERSION: <cadence_version>
+## Uncomment and set the line below if your firewall/proxy blocks ses.sas.download due to certificate trust issues
+# V4_CFG_REPOSITORY_WAREHOUSE: https://ses.sas.com
 
 ## CR Access
 V4_CFG_CR_USER: <container_registry_user>

examples/ansible-vars.yaml

@@ -25,6 +25,8 @@ V4_CFG_SAS_API_SECRET: <api_client_secret>
 V4_CFG_ORDER_NUMBER: <order_number>
 V4_CFG_CADENCE_NAME: <cadence_name> # [lts|stable]
 V4_CFG_CADENCE_VERSION: <cadence_version>
+## Uncomment and set the line below if your firewall/proxy blocks ses.sas.download due to certificate trust issues
+# V4_CFG_REPOSITORY_WAREHOUSE: https://ses.sas.com
 
 ## CR Access
 V4_CFG_CR_USER: <container_registry_user>

roles/vdm/defaults/main.yaml

@@ -21,6 +21,7 @@ V4_CFG_CR_HOST: '{{ V4_CFG_CR_URL | regex_replace("^https?:\/\/(.*)\/?", "\1") }
 
 V4_CFG_SAS_API_KEY: null
 V4_CFG_SAS_API_SECRET: null
+V4_CFG_REPOSITORY_WAREHOUSE: null  # Warehouse endpoint override for sas-orchestration container: ses.sas.download or ses.sas.com
 
 V4_CFG_RWX_FILESTORE_ENDPOINT: null
 V4_CFG_RWX_FILESTORE_PATH: /export

roles/vdm/tasks/deploy.yaml

@@ -64,6 +64,7 @@
         orchestration deploy
              --namespace "{{ NAMESPACE }}"
              --sas-deployment-cr "{{ item.path }}"
+             {{ '--repository-warehouse ' + V4_CFG_REPOSITORY_WAREHOUSE if V4_CFG_REPOSITORY_WAREHOUSE else '' }}
       args:
         chdir: "{{ ORCHESTRATION_TOOLING_DIRECTORY }}"
       with_items:
@@ -83,6 +84,7 @@
              --namespace "{{ NAMESPACE }}"
              --user-content "{{ DEPLOY_DIR }}"
              --local-deployment-assets
+             {{ '--repository-warehouse ' + V4_CFG_REPOSITORY_WAREHOUSE if V4_CFG_REPOSITORY_WAREHOUSE else '' }}
       args:
         chdir: "{{ ORCHESTRATION_TOOLING_DIRECTORY }}"
       with_items:
@@ -104,6 +106,7 @@
         deploy
         --namespace {{ NAMESPACE }}
         --sas-deployment-cr {{ item.path | replace(ORCHESTRATION_TOOLING_DIRECTORY, '/') }}
+        {{ '--repository-warehouse ' + V4_CFG_REPOSITORY_WAREHOUSE if V4_CFG_REPOSITORY_WAREHOUSE else '' }}
       with_items:
         - "{{ deployment_manifests.files }}"
       when:
@@ -126,6 +129,7 @@
         --namespace {{ NAMESPACE }}
         --user-content /src
         --local-deployment-assets
+        {{ '--repository-warehouse ' + V4_CFG_REPOSITORY_WAREHOUSE if V4_CFG_REPOSITORY_WAREHOUSE else '' }}
       when:
         - deployment_tooling == "ansible"
         - V4_CFG_BELOW_THE_LINE