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

[README.md] Minor merge fixes #596

Open
wants to merge 1 commit into
base: prod
Choose a base branch
from
Open

[README.md] Minor merge fixes #596

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
5 changes: 0 additions & 5 deletions deployment/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ The CI/CD pipeline has two jobs defined in [main.yml](../.github/workflows/main.
- **Deploy To AWS**
- Once the "Build and Scan Image with Integration Tests" job passes, the deployment process is initiated.
- We log into AWS and ECR using OIDC roles and configure kubeconfig.
<<<<<<< HEAD
- Then, we deploy using Helm upgrade, which utilizes the `values.yaml` generated from `values.yaml.prod.template` after substituting the variable values.
=======
- Then, we deploy using Helm upgrade, which utilizes the `values.yaml` generated from `values.yaml.develop.template` after substituting the variable values.


## Solr Schema Update

Expand Down Expand Up @@ -92,4 +88,3 @@ Once the collection is created, update the CKAN_SOLR_URL secret in CKAN to use t
CKAN_SOLR_URL: http://solr-url/solr/ckan
```
Where `ckan` is name of newly created collection
>>>>>>> staging
Loading