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

fix(SILVA-529): setting correct oracle connection info #449

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix(SILVA-529): setting correct oracle connection info #449

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
-p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
-p ORACLE_DB_USER=${{ secrets.DB_USER }}
-p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
-p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
-p ORACLE_DB_SERVICE='${{ secrets.ORACLE_DB_SERVICE }}'
-p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
-p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
Expand Down Expand Up @@ -104,6 +106,8 @@ jobs:
-p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
-p ORACLE_DB_USER=${{ secrets.DB_USER }}
-p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
-p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
-p ORACLE_DB_SERVICE='${{ secrets.ORACLE_DB_SERVICE }}'
-p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
-p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr-open.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ jobs:
-p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
-p ORACLE_DB_USER=${{ secrets.DB_USER }}
-p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
-p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
-p ORACLE_DB_SERVICE='${{ secrets.ORACLE_DB_SERVICE }}'
-p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
-p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
-p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
Expand Down
15 changes: 12 additions & 3 deletions backend/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ objects:
imagePullPolicy: Always
env:
- name: ORACLEDB_HOST
value: ${DATABASE_HOST}
valueFrom:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-host
- name: ORACLEDB_SECRET
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -173,11 +176,17 @@ objects:
- name: RESULTS_ENV_OPENSEARCH
value: ${RESULTS_ENV_OPENSEARCH}
- name: DATABASE_HOST
value: ${DATABASE_HOST}
valueFrom:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-host
- name: DATABASE_PORT
value: ${DATABASE_PORT}
- name: SERVICE_NAME
value: ${SERVICE_NAME}
valueFrom:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-service
- name: AWS_COGNITO_ISSUER_URI
value: ${AWS_COGNITO_ISSUER_URI}
- name: DASHBOARD_JOB_IDIR_USERS
Expand Down
8 changes: 8 additions & 0 deletions common/openshift.init.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ parameters:
- name: ORACLE_DB_PASSWORD
description: Oracle database password for API
required: true
- name: ORACLE_DB_HOST
description: Oracle database hostname
required: true
- name: ORACLE_DB_SERVICE
description: Oracle database service name
required: true
- name: ORACLEDB_SECRET
description: Oracle database keystore secret/password
value: changeit
Expand Down Expand Up @@ -65,6 +71,8 @@ objects:
oracle-user: ${ORACLE_DB_USER}
oracle-password: ${ORACLE_DB_PASSWORD}
oracle-secret: ${ORACLEDB_SECRET}
oracle-service: ${ORACLE_DB_SERVICE}
oracle-host: ${ORACLE_DB_HOST}
forest-client-api-key: ${FORESTCLIENTAPI_KEY}
- apiVersion: v1
kind: Secret
Expand Down
Loading