Deployment devops changes for K8s/Learner - JAPACCOE-2831

ansible/artifacts-download.yml

@@ -9,7 +9,7 @@
         name: azure-cloud-storage
         tasks_from: blob-download.yml
       vars:
-        blob_container_name: "{{ artifacts_container }}"
+        blob_container_name: "{{ cloud_storage_artifacts_bucketname }}"
         blob_file_name: "{{ artifact }}"
         local_file_or_folder_path: "{{ artifact_path }}"
         storage_account_name: "{{ cloud_artifact_storage_accountname }}"
@@ -21,6 +21,8 @@
         name: gcp-cloud-storage
         tasks_from: download.yml
       vars:
+        gcp_storage_service_account_name: "{{ cloud_artifact_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_artifact_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
         gcp_path: "{{ artifact }}"
         local_file_or_folder_path: "{{ artifact_path }}"
@@ -32,9 +34,9 @@
         tasks_from: download.yml
       vars:
         local_file_or_folder_path: "{{ artifact_path }}"
-        s3_bucket_name: "{{ aws_artifact_s3_bucket_name }}"
-        s3_path: "{{ artifacts_container }}/{{ artifact }}"
-        aws_default_region: "{{ aws_region }}"
-        aws_access_key_id: "{{ aws_artifact_bucket_access_key }}"
-        aws_secret_access_key: "{{ aws_artifact_bucket_secret_access_key }}"
+        s3_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        s3_path: "{{ artifact }}"
+        aws_default_region: "{{ cloud_public_storage_region }}"
+        aws_access_key_id: "{{ cloud_artifact_storage_accountname }}"
+        aws_secret_access_key: "{{ cloud_artifact_storage_secret }}"
       when: cloud_service_provider == "aws"  

ansible/artifacts-upload.yml

@@ -9,7 +9,7 @@
         name: azure-cloud-storage
         tasks_from: blob-upload.yml
       vars:
-        blob_container_name: "{{ artifacts_container }}"
+        blob_container_name: "{{ cloud_storage_artifacts_bucketname }}"
         container_public_access: "off"
         blob_file_name: "{{ artifact }}"
         local_file_or_folder_path: "{{ artifact_path }}"
@@ -22,6 +22,8 @@
         name: gcp-cloud-storage
         tasks_from: upload.yml
       vars:
+        gcp_storage_service_account_name: "{{ cloud_artifact_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_artifact_storage_secret }}"
         gcp_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
         gcp_path: "{{ artifact }}"
         local_file_or_folder_path: "{{ artifact_path }}"
@@ -33,11 +35,11 @@
         tasks_from: upload.yml
       vars:
         local_file_or_folder_path: "{{ artifact_path }}"
-        s3_bucket_name: "{{ aws_artifact_s3_bucket_name }}"
-        s3_path: "{{ artifacts_container }}/{{ artifact }}"
-        aws_default_region: "{{ aws_region }}"
-        aws_access_key_id: "{{ aws_artifact_bucket_access_key }}"
-        aws_secret_access_key: "{{ aws_artifact_bucket_secret_access_key }}"
+        s3_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        s3_path: "{{ artifact }}"
+        aws_default_region: "{{ cloud_public_storage_region }}"
+        aws_access_key_id: "{{ cloud_artifact_storage_accountname }}"
+        aws_secret_access_key: "{{ cloud_artifact_storage_secret }}"
       when: cloud_service_provider == "aws"
 
     - name: upload artifact to oci oss

ansible/artifacts/sunbird/login/resources/js/telemetry_service.js

@@ -2506,7 +2506,7 @@ if(client_id.toLowerCase() === 'android'){
     "telemetry": {
       "pdata": {
         "id": pdataId,
-        "ver": "5.0.0",
+        "ver": "5.1.0",
         "pid": "sunbird-portal"
       }
     }
@@ -2687,7 +2687,6 @@ if(client_id.toLowerCase() === 'android'){
   function stringToHTML(str) {
     let parser = new DOMParser();
     let doc = parser.parseFromString(str, 'text/html');
-    console.log('Doc parse => ', doc); // TODO: log!
     return doc?.body?.innerText || document.createElement('body');
   }
 

ansible/assets-upload.yml

@@ -2,25 +2,17 @@
 - hosts: localhost
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  # The vars: section is added for the below reason
-  # 1. Introduce a common variable for various clouds. In case of azure, it refers to container name, in case of aws / gcp, it refers to folder name
-  # 2. We want to avoid too many new variable introduction / replacement in first phase. Hence we will reuse the existing variable defined in private repo
-  #    or other default files and just assign the value to the newly introduced common variable 
-  # 3. After few releases, we will remove the older variables and use only the new variables across the repos
-  vars:
-    player_cdn_storage: "{{ player_cdn_container }}"
   # Azure
   tasks:
   - name: this block consists of tasks related to azure storage
     block:
     - name: set common azure variables
       set_fact:
-        blob_container_name: "{{ player_cdn_storage }}"
+        blob_container_name: "{{ cloud_storage_playercdn_bucketname }}"
         container_public_access: "container"
         blob_container_folder_path: ""
         storage_account_name: "{{ cloud_public_storage_accountname }}"
         storage_account_key: "{{ cloud_public_storage_secret }}"
-        storage_account_sas_token: "{{ azure_public_storage_account_sas }}"
 
     - name: delete files and folders from azure storage using azcopy
       include_role:
@@ -40,11 +32,11 @@
     block:
     - name: set common aws variables
       set_fact:
-        s3_bucket_name: "{{ aws_public_s3_bucket_name }}"
-        s3_path: "{{ player_cdn_storage }}"
-        aws_default_region: "{{ aws_region }}"
-        aws_access_key_id: "{{ aws_public_bucket_access_key }}"
-        aws_secret_access_key: "{{ aws_public_bucket_secret_access_key }}"
+        s3_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
+        s3_path: ""
+        aws_default_region: "{{ cloud_public_storage_region }}"
+        aws_access_key_id: "{{ cloud_public_storage_accountname }}"
+        aws_secret_access_key: "{{ cloud_public_storage_secret }}"
 
     - name: delete files and folders from s3
       include_role:
@@ -64,10 +56,12 @@
     block:
     - name: set common gcloud variables
       set_fact:
-        dest_folder_name: "{{ player_cdn_storage }}"
-        dest_folder_path: ""
-        file_delete_pattern: "{{ player_cdn_storage }}/"
-        gcp_bucket_name: "{{ gcloud_public_bucket_name }}"
+        gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
+        gcp_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
+        gcp_path: ""
+        file_delete_pattern: ""
+
 
     - name: delete files and folders from gcloud storage
       include_role:

ansible/deploy-plugins.yml

@@ -2,13 +2,6 @@
   gather_facts: no
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
-  # The vars: section is added for the below reason
-  # 1. Introduce a common variable for various clouds. In case of azure, it refers to container name, in case of aws / gcp, it refers to folder name
-  # 2. We want to avoid too many new variable introduction / replacement in first phase. Hence we will reuse the existing variable defined in private repo
-  #    or other default files and just assign the value to the newly introduced common variable 
-  # 3. After few releases, we will remove the older variables and use only the new variables across the repos
-  vars:
-    plugin_storage: "{{ plugin_container_name }}"
   tasks:
     - name: rename env_domain in preview_cdn.html for CDN
       shell: |
@@ -22,11 +15,10 @@
       block:
         - name: set common azure variables
           set_fact:
-            blob_container_name: "{{ plugin_storage }}"
+            blob_container_name: "{{ cloud_storage_content_bucketname }}"
             container_public_access: "container"
             storage_account_name: "{{ cloud_public_storage_accountname }}"
             storage_account_key: "{{ cloud_public_storage_secret }}"
-            storage_account_sas_token: "{{ azure_public_storage_account_sas }}"
           tags:
             - always
           no_log: True
@@ -148,6 +140,8 @@
               name: gcp-cloud-storage
               tasks_from: "{{ item[0] }}"
             vars:
+              gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+              gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
               file_delete_pattern: "content-plugins/{{ item[1] }}/*"
               gcp_path: "content-plugins/{{ item[1] }}"
               local_file_or_folder_path: "{{ source_folder }}/{{ item[1] }}"
@@ -168,10 +162,10 @@
       block:
         - name: set common aws variables
           set_fact:
-            aws_default_region: "{{ aws_region }}"
-            s3_bucket_name: "{{ aws_public_s3_bucket_name }}"
-            aws_access_key_id: "{{ aws_public_bucket_access_key }}"
-            aws_secret_access_key: "{{ aws_public_bucket_secret_access_key }}"
+            aws_default_region: "{{ cloud_public_storage_region }}"
+            s3_bucket_name: "{{ cloud_storage_content_bucketname }}"
+            aws_access_key_id: "{{ cloud_public_storage_accountname }}"
+            aws_secret_access_key: "{{ cloud_public_storage_secret }}"
           tags:
             - always
 
@@ -181,7 +175,7 @@
               name: aws-cloud-storage
               tasks_from: delete-folder.yml
           vars:
-              s3_path: "{{ plugin_storage }}/{{ folder_name }}"
+              s3_path: "{{ folder_name }}"
           tags:
             - content-editor
             - collection-editor
@@ -194,7 +188,7 @@
               name: aws-cloud-storage
               tasks_from: upload-folder.yml
             vars:
-              s3_path: "{{ plugin_storage }}/{{ folder_name }}"
+              s3_path: "{{ folder_name }}"
               local_file_or_folder_path: "{{ source_name }}"
           tags:
             - content-editor 
@@ -210,14 +204,14 @@
               name: aws-cloud-storage
               tasks_from: upload.yml
             vars:
-              s3_path: "{{ plugin_storage }}/artefacts/content-player/content-player-{{ player_version_number }}.zip"
+              s3_path: "artefacts/content-player/content-player-{{ player_version_number }}.zip"
               local_file_or_folder_path: "{{ source_file_name }}"
           tags:
             - preview
 
         - block:
           - name:  run the s3_copy.sh script
-            shell: "bash {{ s3_file_path }} {{ plugin_storage }} {{ source_file }} {{ aws_public_s3_bucket_name }}"
+            shell: "bash {{ s3_file_path }} {{ source_file }} {{ cloud_public_storage_accountname }}"
             async: 3600
             poll: 10
             environment: