[ED-4185] merge Release 6.0.0 to 7.0.1 #4015

santhosh-tg · 2024-07-04T06:13:28Z

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

Please choose appropriate options.

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Enhancement (additive changes to improve performance)
This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes in the below checkboxes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Ran Test A
Ran Test B

Test Configuration:

Software versions:
Hardware versions:

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
Any dependent changes have been merged and published in downstream modules

* Updated vars for cron schedule * Update main.yml

* Update Jenkins version * Fix job parameter * Fix error: You need to install jmespath prior to running json_query filter

Co-authored-by: gohilamariappan <[email protected]>

* ED-2838 Release-6.0.0 new variables * Added with comments * ED-2838 jenkins josb update and new variables * added storage endpoint detials

* Update maven repo url * Add missing jobs * Fix docker creds secrets issue when having specialcharacters

* Add OCI specific vars * Add mobile deeplink url var

Add ml_core_internal_access_token for private repo template

Co-authored-by: ankitshahu <[email protected]>

Renamed to correct variable name as mentioned in defaults. Ref: https://github.com/project-sunbird/sunbird-devops/blob/release-6.0.0/ansible/roles/log-es6/defaults/main.yml

* saving changes * added Upload api endpoint in public kong --------- Co-authored-by: ankitshahu <[email protected]>

#3915) * nginx-cors Signed-off-by: Deepak Devadathan <[email protected]> * hostname changed Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * added nginx-cors-public chart Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * corrected proxy conf Signed-off-by: Deepak Devadathan <[email protected]> * corrected syntax Signed-off-by: Deepak Devadathan <[email protected]> * changed nodeport Signed-off-by: Deepak Devadathan <[email protected]> * removed duplicate Signed-off-by: Deepak Devadathan <[email protected]> * nodeport change Signed-off-by: Deepak Devadathan <[email protected]> * nodeport change Signed-off-by: Deepak Devadathan <[email protected]> * changed public ip Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * removed nginx-cors ansible roles Signed-off-by: Deepak Devadathan <[email protected]> * added jenkins job for nginx-cors-public deployment Signed-off-by: Deepak Devadathan <[email protected]> * updated variable in values.j2 Signed-off-by: Deepak Devadathan <[email protected]> * testing public ingress along with s3 cors Signed-off-by: Deepak Devadathan <[email protected]> * testing with condition for csp Signed-off-by: Deepak Devadathan <[email protected]> * removed nginx-cors-public Signed-off-by: Deepak Devadathan <[email protected]> --------- Signed-off-by: Deepak Devadathan <[email protected]>

Issue #CO-824: dynamic redirect URL

#OB-553 fix: Analytics service issue fixes for OCI

6.0.0

* helm chart for ml-analytics * Update and rename values.yaml to values.j2 * Update main.yml * Update ml-analytics-service.conf * Update ml-analytics-service.conf * Delete kubernetes/helm_charts/core/ml-analytics-service/templates/NOTES.txt * Update deployment.yaml * Update deployment.yaml * Update deployment.yaml * Update values.j2 * Update deployment.yaml * Update deployment.yaml * Update ml-analytics-service.conf * Update deployment.yaml * Update ml-analytics-service.conf * Update ml-analytics-service.conf * Update ml-analytics-service.conf * Update ml-analytics-service.conf * Updated ml-analytics-service.conf * added new kafka topics for observations * Update ml-analytics-service.conf --------- Co-authored-by: raghupathi <[email protected]> Co-authored-by: Raghupathi Guduri <[email protected]>

Issue #IQ-750 fix: added script for inquiry schema upload

Issue #IQ-750 fix: updated jenkins file

Issue #IQ-750 fix: updated jenkins script

ED-3534:- Adoption Changes in ML service

Update secrets.yml

* updated druid ports * updated druid ports * key changes * key changes --------- Co-authored-by: vivek <[email protected]>

* Add ml_core_internal_access_token for pvt repo template * Update common.yml

Free monitoring was decommissioned and removed from configuration on April 2023 for MongoDB Community instances. Commenting out because mongo service does not start due to invalid configuration. Ref: https://www.mongodb.com/docs/manual/release-notes/4.0/

Renamed variable

* added initial version of oci provisioning Signed-off-by: Deepak Devadathan <[email protected]> * added instructions to run the command Signed-off-by: Deepak Devadathan <[email protected]> * testing simple network layout Signed-off-by: Deepak Devadathan <[email protected]> * testing vm creation Signed-off-by: Deepak Devadathan <[email protected]> * testing k8s version Signed-off-by: Deepak Devadathan <[email protected]> * create oke Signed-off-by: Deepak Devadathan <[email protected]> * testing with oke Signed-off-by: Deepak Devadathan <[email protected]> * testing with auth type Signed-off-by: Deepak Devadathan <[email protected]> * removed auth_type Signed-off-by: Deepak Devadathan <[email protected]> * with min configuration Signed-off-by: Deepak Devadathan <[email protected]> * change oke Signed-off-by: Deepak Devadathan <[email protected]> * k8s cluster Signed-off-by: Deepak Devadathan <[email protected]> * testing images Signed-off-by: Deepak Devadathan <[email protected]> * aded tags Signed-off-by: Deepak Devadathan <[email protected]> * removed debug Signed-off-by: Deepak Devadathan <[email protected]> * setting oke Signed-off-by: Deepak Devadathan <[email protected]> * corrected tags Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * disabling options Signed-off-by: Deepak Devadathan <[email protected]> * updated subnet id Signed-off-by: Deepak Devadathan <[email protected]> * removed options Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * removed service cidr Signed-off-by: Deepak Devadathan <[email protected]> * removed options Signed-off-by: Deepak Devadathan <[email protected]> * updted Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * removed subnet id Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * testing Signed-off-by: Deepak Devadathan <[email protected]> * removed k8s network config Signed-off-by: Deepak Devadathan <[email protected]> * re factoring nework Signed-off-by: Deepak Devadathan <[email protected]> * testing oke Signed-off-by: Deepak Devadathan <[email protected]> * updated route table Signed-off-by: Deepak Devadathan <[email protected]> * enabling oke Signed-off-by: Deepak Devadathan <[email protected]> * create jenkins Signed-off-by: Deepak Devadathan <[email protected]> * added oci cli setup Signed-off-by: Deepak Devadathan <[email protected]> * moved oci to bin Signed-off-by: Deepak Devadathan <[email protected]> * added profile Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * disabling oke Signed-off-by: Deepak Devadathan <[email protected]> * testing bootstrap Signed-off-by: Deepak Devadathan <[email protected]> * testing jenkins with bootstrap Signed-off-by: Deepak Devadathan <[email protected]> * testing vm bootstrap Signed-off-by: Deepak Devadathan <[email protected]> * corrected varible Signed-off-by: Deepak Devadathan <[email protected]> * testing neo4j upload Signed-off-by: Deepak Devadathan <[email protected]> * testing output Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * testing jenkins info Signed-off-by: Deepak Devadathan <[email protected]> * info tgs Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * jenkins without bootstrap Signed-off-by: Deepak Devadathan <[email protected]> * disabled private vm Signed-off-by: Deepak Devadathan <[email protected]> * removed bootstrapping jenkins Signed-off-by: Deepak Devadathan <[email protected]> * test Signed-off-by: Deepak Devadathan <[email protected]> * added s3 keys Signed-off-by: Deepak Devadathan <[email protected]> * e2e changes Signed-off-by: Deepak Devadathan <[email protected]> * removed unwanted comments Signed-off-by: Deepak Devadathan <[email protected]> * updated ocir url Signed-off-by: Deepak Devadathan <[email protected]> * added disclaimer Signed-off-by: Deepak Devadathan <[email protected]> * added defaults Signed-off-by: Deepak Devadathan <[email protected]> * removed comments Signed-off-by: Deepak Devadathan <[email protected]> * updated name Signed-off-by: Deepak Devadathan <[email protected]> * added defaults for vcn and subnet cidr Signed-off-by: Deepak Devadathan <[email protected]> * updated variable Signed-off-by: Deepak Devadathan <[email protected]> * variable name for repo Signed-off-by: Deepak Devadathan <[email protected]> * updated private vm names Signed-off-by: Deepak Devadathan <[email protected]> * updated output Signed-off-by: Deepak Devadathan <[email protected]> * added geo ip variable check Signed-off-by: Deepak Devadathan <[email protected]> * updated the rgion Signed-off-by: Deepak Devadathan <[email protected]> * added default env name to append to bucket names Signed-off-by: Deepak Devadathan <[email protected]> * corrected syntax for default values Signed-off-by: Deepak Devadathan <[email protected]> * added key for instance provisioning This is added for idempotence of instances Signed-off-by: Deepak Devadathan <[email protected]> * updated additional buckets Signed-off-by: Deepak Devadathan <[email protected]> * updated the comments Signed-off-by: Deepak Devadathan <[email protected]> * added env prefix to vm names Signed-off-by: Deepak Devadathan <[email protected]> * added env prefix to oke cluster name Signed-off-by: Deepak Devadathan <[email protected]> --------- Signed-off-by: Deepak Devadathan <[email protected]>

santhosh-tg and others added 30 commits September 14, 2023 09:02

Fix syntax (#3894)

408c8c4

Updated vars for cron schedule (#3895)

d6c6875

* Updated vars for cron schedule * Update main.yml

[ED-2793] Fix: release-6.0.0 installation issues (#3900)

8dc81f6

* Update Jenkins version * Fix job parameter * Fix error: You need to install jmespath prior to running json_query filter

Update main.yml with cassandra (#3845) (#3901)

6320664

Co-authored-by: gohilamariappan <[email protected]>

ED-2838: ##Release-6.0.0 new variables (#3899)

6ce00cf

* ED-2838 Release-6.0.0 new variables * Added with comments * ED-2838 jenkins josb update and new variables * added storage endpoint detials

[ED-2793] Fix installation issues (#3905)

3924727

* Update maven repo url * Add missing jobs * Fix docker creds secrets issue when having specialcharacters

[ED-2793] Add OCI specific vars (#3912)

bf876cc

* Add OCI specific vars * Add mobile deeplink url var

Add ml_core_internal_access_token for private repo template

d8d4479

Add ml_core_internal_access_token for private repo template

Merge pull request #3918 from aks30/patch-9

2101224

Add ml_core_internal_access_token for private repo template

Update cassandra jenkins job config (#3927)

22eaac2

saving changes (#3935)

b8d7b88

Co-authored-by: ankitshahu <[email protected]>

Update repository-oci.yml

2df0fe4

Renamed to correct variable name as mentioned in defaults. Ref: https://github.com/project-sunbird/sunbird-devops/blob/release-6.0.0/ansible/roles/log-es6/defaults/main.yml

#OB-553 fix: Analytics service issue fixes for OCI

7c59bce

#OB-553 fix: Analytics service issue fixes for OCI

5af4495

ED-3534:- Adoption Changes in ML service (#3963)

3fb0c3e

* saving changes * added Upload api endpoint in public kong --------- Co-authored-by: ankitshahu <[email protected]>

Added new kafka topics in main.yml and config.j2 (#3970)

eb6d21a

Issue #CO-824: dynamic redirect URL

463de74

Issue #CO-824: dynamic redirect URL

856963b

Issue #CO-824: SSO Isse condition update

cc13e08

Merge pull request #3972 from shubhambansaltarento/bug/CO-CO-824

6c55e1a

Issue #CO-824: dynamic redirect URL

Merge pull request #3961 from sowmya-dixit/release-6.0.0

e647be6

#OB-553 fix: Analytics service issue fixes for OCI

Issue ED-0000 report service env update

bd77480

Issue ED-0000 report service env update (#3977)

c474dce

Issue ED-0000 report service env update

1e2d9ed

Issue ED-0000 report service env update

d4b852e

Merge pull request #3979 from rajeevsathish/6.0.0

bdccf0e

6.0.0

Issue ED-0000 report service env update (#3981)

ac243f7

Issue #IQ-750 fix: added script for inquiry schema upload

d14902b

santhosh-tg and others added 18 commits April 15, 2024 17:45

Merge pull request #3985 from krgauraw/release-6.0.0

e0169de

Issue #IQ-750 fix: added script for inquiry schema upload

Issue #IQ-750 fix: updated jenkins file

890d5a8

Merge pull request #3986 from krgauraw/release-6.0.0

ce7f1e7

Issue #IQ-750 fix: updated jenkins file

added the faust related changes

9d27bff

Issue #IQ-750 fix: updated jenkins script

17fcae4

Merge pull request #3987 from krgauraw/release-6.0.0

669e9b5

Issue #IQ-750 fix: updated jenkins script

added the value to ml_analytics_faust_applications_list

4a20409

Update secrets.yml

b65d398

Merge pull request #3988 from Vivek-M-08/release-6.0.0

70c69d1

ED-3534:- Adoption Changes in ML service

Merge pull request #3990 from ankitpws/patch-1

b4a3248

Update secrets.yml

ED-3534:- Adoption Changes in ML service (#3993)

06cc35a

* updated druid ports * updated druid ports * key changes * key changes --------- Co-authored-by: vivek <[email protected]>

Add release-6.0.0 missing vars (#3995)

7e703a9

hpa apiversion changes (#4012)

876c23f

LR-437 | legacy certificate migrator flink job name added (#3830)

4859e5c

Add ml_core_internal_access_token for pvt repo template (#3917)

9669630

* Add ml_core_internal_access_token for pvt repo template * Update common.yml

Merge pull request #3944 from akulavasu/release-6.0.0

74793b6

Renamed variable

santhosh-tg changed the title ~~merge Release 6.0.0 to 7.0.0~~ [ED-4185] merge Release 6.0.0 to 7.0.0 Jul 4, 2024

gandham-santhosh changed the base branch from release-7.0.0 to release-7.0.1 July 12, 2024 04:57

santhosh-tg changed the title ~~[ED-4185] merge Release 6.0.0 to 7.0.0~~ [ED-4185] merge Release 6.0.0 to 7.0.1 Jul 12, 2024

santhosh-tg merged commit 90c4b37 into release-7.0.1 Jul 15, 2024
1 check failed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ED-4185] merge Release 6.0.0 to 7.0.1 #4015

[ED-4185] merge Release 6.0.0 to 7.0.1 #4015

santhosh-tg commented Jul 4, 2024

[ED-4185] merge Release 6.0.0 to 7.0.1 #4015

[ED-4185] merge Release 6.0.0 to 7.0.1 #4015

Conversation

santhosh-tg commented Jul 4, 2024

Type of change

How Has This Been Tested?

Checklist: