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

chore(ci): sync secrets object #1472

Merged
merged 3 commits into from
Aug 2, 2024
Merged

chore(ci): sync secrets object #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c2170a
Split out secrets for sync, drop port secret
DerekRoberts Aug 2, 2024
15610ba
Consume new secret
DerekRoberts Aug 2, 2024
5d55ffc
Fix ORACLE_PORT
DerekRoberts Aug 2, 2024
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
13 changes: 9 additions & 4 deletions common/openshift.init.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ parameters:
- name: ORACLE_HOST
description: Oracle database host
value: nrcdb03.bcgov
- name: ORACLE_PORT
description: Oracle database port
value: "1543"
- name: ORACLE_SERVICE
description: Oracle service name
value: dbq01.nrs.bcgov
Expand Down Expand Up @@ -43,10 +40,18 @@ objects:
stringData:
oracle-host: ${ORACLE_HOST}
oracle-password: ${ORACLE_PASSWORD}
oracle-port: ${ORACLE_PORT}
oracle-service: ${ORACLE_SERVICE}
oracle-user: ${ORACLE_USER}
oracle-secret: ${ORACLE_CERT_SECRET}
- apiVersion: v1
kind: Secret
metadata:
name: ${NAME}-${ZONE}-sync
labels:
app: ${NAME}-${ZONE}
stringData:
oracle-host: ${ORACLE_HOST}
oracle-service: ${ORACLE_SERVICE}
oracle-sync-password: ${ORACLE_SYNC_PASSWORD}
oracle-sync-user: ${ORACLE_SYNC_USER}
- apiVersion: v1
Expand Down
13 changes: 5 additions & 8 deletions oracle-api/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ parameters:
description: Oracle API environment for OpenSearch. # One of: development, test, production
required: false
value: development
- name: DATABASE_PORT
description: Oracle database port
value: "1543"
- name: ORACLEDB_KEYSTORE
description: Keystore location path
- name: AWS_COGNITO_ISSUER_URI
Expand Down Expand Up @@ -105,10 +108,7 @@ objects:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-secret
- name: DATABASE_PORT
valueFrom:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-port
value: ${DATABASE_PORT}
volumeMounts:
- name: ${NAME}-${ZONE}-${COMPONENT}-certs
mountPath: /cert
Expand Down Expand Up @@ -136,10 +136,7 @@ objects:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-host
- name: DATABASE_PORT
valueFrom:
secretKeyRef:
name: ${NAME}-${ZONE}-${COMPONENT}
key: oracle-port
value: ${DATABASE_PORT}
- name: SERVICE_NAME
valueFrom:
secretKeyRef:
Expand Down
16 changes: 8 additions & 8 deletions sync/openshift.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ parameters:
- name: APP
description: Application/component name
value: sync
- name: ORACLE_PORT
description: Oracle database port
value: "1543"
- name: EXECUTION_ID
description: Process execution ID for running ETL Tool
value: "100"
Expand Down Expand Up @@ -83,27 +86,24 @@ objects:
- name: ORACLE_HOST
valueFrom:
secretKeyRef:
name: ${REPO}-${ZONE}-oracle-api
name: ${REPO}-${ZONE}-sync
key: oracle-host
- name: ORACLE_SYNC_PASSWORD
valueFrom:
secretKeyRef:
name: ${REPO}-${ZONE}-oracle-api
name: ${REPO}-${ZONE}-sync
key: oracle-sync-password
- name: ORACLE_PORT
valueFrom:
secretKeyRef:
name: ${REPO}-${ZONE}-oracle-api
key: oracle-port
value: ${ORACLE_PORT}
- name: ORACLE_SERVICE
valueFrom:
secretKeyRef:
name: ${REPO}-${ZONE}-oracle-api
name: ${REPO}-${ZONE}-sync
key: oracle-service
- name: ORACLE_SYNC_USER
valueFrom:
secretKeyRef:
name: ${REPO}-${ZONE}-oracle-api
name: ${REPO}-${ZONE}-sync
key: oracle-sync-user
- name: POSTGRES_HOST
value: ${REPO}-${ZONE}-database
Expand Down
Loading