Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #KN-231 chore: Added the default value for aws and gcloud. #1780

Open
wants to merge 1 commit into
base: release-4.10.1
Choose a base branch
from
+54 −0
Open

Issue #KN-231 chore: Added the default value for aws and gcloud. #1780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions kubernetes/helm_charts/datapipeline_jobs/values.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,11 +473,25 @@ asset-enrichment:
size.pixel = 150
}
content_youtube_apikey="{{ youtube_api_key }}"

#Cloud storage config
cloud_storage_type="{{ cloud_store }}"

#azure cloud config
azure_storage_key="{{ sunbird_public_storage_account_name }}"
azure_storage_secret="{{ sunbird_public_storage_account_key }}"
azure_storage_container="{{ azure_public_container }}"

#AWS cloud config
aws_storage_key= "{{ aws_cred_storage_key }}"
aws_storage_secret= "{{ aws_cred_storage_secret }}"
aws_storage_container= "{{ aws_storage_container_name }}"

#Google cloud config
gcloud_client_key: "{{ sunbird_gcloud_client_key }}"
gcloud_private_secret: "{{ sunbird_gcloud_private_secret }}"
gcloud_storage_bucket: "{{ sunbird_gcloud_storage_bucket }}"

flink-conf: |+
jobmanager.memory.flink.size: {{ flink_job_names['asset-enrichment'].jobmanager_memory }}
taskmanager.memory.flink.size: {{ flink_job_names['asset-enrichment'].taskmanager_memory }}
Expand Down Expand Up @@ -533,11 +547,25 @@ auto-creator-v2:
service {
content.basePath = "{{ kp_content_service_base_url }}"
}

#Cloud storage config
cloud_storage_type="{{ cloud_store }}"

#azure cloud config
azure_storage_key="{{ sunbird_public_storage_account_name }}"
azure_storage_secret="{{ sunbird_public_storage_account_key }}"
azure_storage_container="{{ azure_public_container }}"

#AWS cloud config
aws_storage_key= "{{ aws_cred_storage_key }}"
aws_storage_secret= "{{ aws_cred_storage_secret }}"
aws_storage_container= "{{ aws_storage_container_name }}"

#Google cloud config
gcloud_client_key: "{{ sunbird_gcloud_client_key }}"
gcloud_private_secret: "{{ sunbird_gcloud_private_secret }}"
gcloud_storage_bucket: "{{ sunbird_gcloud_storage_bucket }}"

source {
baseUrl="{{ source_base_url }}"
}
Expand Down Expand Up @@ -581,11 +609,24 @@ content-auto-creator:
learning_service.basePath = "{{ kp_learning_service_base_url }}"
}

#Cloud storage config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate entry. This is already defined on top line 552

cloud_storage_type="{{ cloud_store }}"

#azure cloud config
azure_storage_key="{{ sunbird_public_storage_account_name }}"
azure_storage_secret="{{ sunbird_public_storage_account_key }}"
azure_storage_container="{{ azure_public_container }}"

#AWS cloud config
aws_storage_key= "{{ aws_cred_storage_key }}"
aws_storage_secret= "{{ aws_cred_storage_secret }}"
aws_storage_container= "{{ aws_storage_container_name }}"

#Google cloud config
gcloud_client_key: "{{ sunbird_gcloud_client_key }}"
gcloud_private_secret: "{{ sunbird_gcloud_private_secret }}"
gcloud_storage_bucket: "{{ sunbird_gcloud_storage_bucket }}"

content_auto_creator {
actions=auto-create
allowed_object_types=["Content"]
Expand Down Expand Up @@ -1018,11 +1059,24 @@ qrcode-image-generator:
margin=1
}

#Cloud storage config
cloud_storage_type="{{ cloud_store }}"

#azure cloud config
azure_storage_key="{{ sunbird_public_storage_account_name }}"
azure_storage_secret="{{ sunbird_public_storage_account_key }}"
azure_storage_container="{{ azure_public_container }}"

#AWS cloud config
aws_storage_key= "{{ aws_cred_storage_key }}"
aws_storage_secret= "{{ aws_cred_storage_secret }}"
aws_storage_container= "{{ aws_storage_container_name }}"

#Google cloud config
gcloud_client_key: "{{ sunbird_gcloud_client_key }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same keys are duplicated multiple times. Check all CSP configuration properties once.

gcloud_private_secret: "{{ sunbird_gcloud_private_secret }}"
gcloud_storage_bucket: "{{ sunbird_gcloud_storage_bucket }}"

lms-cassandra {
keyspace = "dialcodes"
table {
Expand Down