From d826116923f430d3cafcd4eebdd90aeaa75fd51d Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Mon, 19 Aug 2024 09:40:25 -0700 Subject: [PATCH] chore: changing deployment to tools env --- .github/workflows/legacy-pr.yml | 36 +++++---------------------------- database/openshift.legacy.yml | 15 ++++++++++++++ 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/.github/workflows/legacy-pr.yml b/.github/workflows/legacy-pr.yml index 8c52c1ded1..778e5bf9a1 100644 --- a/.github/workflows/legacy-pr.yml +++ b/.github/workflows/legacy-pr.yml @@ -55,7 +55,7 @@ jobs: with: package: legacydb build_file: ./database/Dockerfile.legacy - tag: ${{ github.event.number }} + tag: latest tag_fallback: test triggers: ('database/') build_args: | @@ -73,41 +73,15 @@ jobs: - uses: actions/checkout@v4 - name: Initializing Deployment - uses: bcgov-nr/action-deployer-openshift@v2.3.0 - with: - file: common/openshift.init.yml - oc_namespace: ${{ secrets.OC_NAMESPACE }} - oc_server: ${{ secrets.OC_SERVER }} - oc_token: ${{ secrets.OC_TOKEN }} - overwrite: true - parameters: - -p ZONE=${{ github.event.number }} - -p ORACLEDB_USER=${{ secrets.ORACLEDB_USERNAME }} - -p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }} - -p ORACLEDB_USER_W=${{ secrets.ORACLEDB_USERNAME_W }} - -p ORACLEDB_PASSWORD_W=${{ secrets.ORACLEDB_PASSWORD_W }} - -p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }} - -p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }} - -p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }} - -p ORACLEDB_SECRET=${{ secrets.ORACLEDB_SECRET }} - -p BCREGISTRY_KEY=${{ secrets.BCREGISTRY_KEY }} - -p BCREGISTRY_ACCOUNT=${{ secrets.BCREGISTRY_ACCOUNT }} - -p CHES_CLIENT_ID=${{ secrets.CHES_CLIENT_ID }} - -p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }} - -p ADDRESS_COMPLETE_KEY=${{ secrets.ADDRESS_COMPLETE_KEY }} - -p DB_PASSWORD=$(echo ${{github.ref}}${{github.event.number}}|md5sum|cut -d' ' -f1) - -p COGNITO_USER_POOL=${{ secrets.COGNITO_USER_POOL }} - -p COGNITO_ENVIRONMENT=DEV - -p CHES_MAIL_COPY=${{ secrets.CHES_MAIL_COPY }} - - - name: Deploy Database Legacy uses: bcgov-nr/action-deployer-openshift@v2.3.0 with: file: database/openshift.legacy.yml - oc_namespace: ${{ secrets.OC_NAMESPACE }} + oc_namespace: ${{ secrets.OC_TOOLS_NAMESPACE }} oc_server: ${{ secrets.OC_SERVER }} oc_token: ${{ secrets.OC_TOKEN }} overwrite: false parameters: - -p ZONE=${{ github.event.number }} + -p ZONE=tools + -p ORACLEDB_USER_W=${{ secrets.ORACLEDB_USERNAME_W }} + -p ORACLEDB_PASSWORD_W=${{ secrets.ORACLEDB_PASSWORD_W }} -p PROMOTE=${{ github.repository }}/legacydb:${{ github.event.number }} diff --git a/database/openshift.legacy.yml b/database/openshift.legacy.yml index 77ccfb62af..cc65cd9329 100644 --- a/database/openshift.legacy.yml +++ b/database/openshift.legacy.yml @@ -25,6 +25,12 @@ parameters: - name: PROMOTE description: Image (namespace/name:tag) to promote/import required: true + - name: ORACLEDB_USER_W + description: Oracle database user name with write permission + required: true + - name: ORACLEDB_PASSWORD_W + description: Oracle database password with write permission + required: true - name: CPU_REQUEST value: 500m - name: CPU_LIMIT @@ -34,6 +40,15 @@ parameters: - name: MEMORY_LIMIT value: 2Gi objects: + - kind: Secret + apiVersion: v1 + metadata: + name: ${NAME}-${ZONE} + labels: + app: ${NAME}-${ZONE} + stringData: + oracle-user-write: ${ORACLEDB_USER_W} + oracle-password-write: ${ORACLEDB_PASSWORD_W} - kind: ImageStream apiVersion: v1 metadata: