diff --git a/.github/workflows/analytics-api-cd.yml b/.github/workflows/analytics-api-cd.yml index 766ee75dc..d1f342795 100644 --- a/.github/workflows/analytics-api-cd.yml +++ b/.github/workflows/analytics-api-cd.yml @@ -13,10 +13,6 @@ on: description: "Environment (dev/test/prod)" required: true default: "dev" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "EAO" # Default value is EAO defaults: run: @@ -26,13 +22,12 @@ defaults: env: APP_NAME: "analytics-api" TAG_NAME: "${{github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }} - OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }} - OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }} - OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }} + OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: analytics-api-cd: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3c2c16976..f8fc52a9f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,10 +7,6 @@ on: description: "Environment (test/prod)" required: true default: "test" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "GDX" # Default value is GDX defaults: run: @@ -19,12 +15,10 @@ defaults: env: TAG_NAME: "${{ github.event.inputs.environment || 'test' }}" # If the environment type is manually selected, use the input value; otherwise, use 'test' as default - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'GDX' }}" # If the project type is manually selected, use the input value; otherwise, use 'GDX' as default - # Set OpenShift related variables based on PROJECT_TYPE OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ (github.event.inputs.project_type == 'EAO') && secrets.OPENSHIFT_SA_TOKEN_EAO || secrets.OPENSHIFT_SA_TOKEN }} - OPENSHIFT_REPOSITORY: ${{ (github.event.inputs.project_type == 'EAO') && secrets.OPENSHIFT_REPOSITORY_EAO || secrets.OPENSHIFT_REPOSITORY }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: met-deployment: diff --git a/.github/workflows/met-api-cd.yml b/.github/workflows/met-api-cd.yml index 1fd9a2478..af67f00b1 100644 --- a/.github/workflows/met-api-cd.yml +++ b/.github/workflows/met-api-cd.yml @@ -12,11 +12,7 @@ on: environment: description: "Environment (dev/test/prod)" required: true - default: "dev" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "EAO" # Default value is EAO + default: "dev" defaults: run: @@ -26,14 +22,12 @@ defaults: env: APP_NAME: "met-api" TAG_NAME: "${{ github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default - # Set OpenShift related variables based on PROJECT_TYPE OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }} - OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }} - OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }} - OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }} + OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: diff --git a/.github/workflows/met-cron-cd.yml b/.github/workflows/met-cron-cd.yml index 8ef1a1467..52c3989db 100644 --- a/.github/workflows/met-cron-cd.yml +++ b/.github/workflows/met-cron-cd.yml @@ -13,11 +13,7 @@ on: environment: description: "Environment (dev/test/prod)" required: true - default: "dev" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "EAO" # Default value is EAO + default: "dev" defaults: run: @@ -27,13 +23,12 @@ defaults: env: APP_NAME: "met-cron" TAG_NAME: "${{github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }} - OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }} - OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }} - OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }} + OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: diff --git a/.github/workflows/met-etl-cd.yml b/.github/workflows/met-etl-cd.yml index f9107b950..b19147e92 100644 --- a/.github/workflows/met-etl-cd.yml +++ b/.github/workflows/met-etl-cd.yml @@ -13,11 +13,7 @@ on: environment: description: "Environment (dev/test/prod)" required: true - default: "dev" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "EAO" # Default value is EAO + default: "dev" defaults: run: @@ -28,14 +24,12 @@ env: APP_NAME: "dagster-etl" DEPLOYMENT_NAME: "dagster-dagster-user-deployments-etl" TAG_NAME: "dev" - - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }} - OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }} - OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }} - OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }} + OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: met-cron-cd: diff --git a/.github/workflows/met-web-cd.yml b/.github/workflows/met-web-cd.yml index 3cc83a4d0..7d45aeb7b 100644 --- a/.github/workflows/met-web-cd.yml +++ b/.github/workflows/met-web-cd.yml @@ -13,10 +13,6 @@ on: description: "Environment (dev/test/prod)" required: true default: "dev" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "EAO" # Default value is EAO defaults: run: @@ -26,14 +22,12 @@ defaults: env: APP_NAME: "met-web" TAG_NAME: "${{ github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default - - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }} - OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }} - OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }} - OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }} + OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: met-web-cd: diff --git a/.github/workflows/notify-api-cd.yml b/.github/workflows/notify-api-cd.yml index ab564a4c7..959693a29 100644 --- a/.github/workflows/notify-api-cd.yml +++ b/.github/workflows/notify-api-cd.yml @@ -13,10 +13,6 @@ on: description: "Environment (dev/test/prod)" required: true default: "dev" - project_type: - description: "Project Type (EAO/GDX)" - required: false - default: "EAO" # Default value is EAO defaults: run: @@ -27,13 +23,11 @@ env: APP_NAME: "notify-api" TAG_NAME: "${{ github.event.inputs.environment || 'dev' }}" # If the environment type is manually selected, use the input value; otherwise, use 'dev' as default - PROJECT_TYPE: "${{ github.event.inputs.project_type || 'EAO' }}" # If the project type is manually selected, use the input value; otherwise, use 'EAO' as default - OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }} - OPENSHIFT_SA_TOKEN: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_TOKEN || secrets.OPENSHIFT_SA_TOKEN_EAO }} - OPENSHIFT_SA_NAME: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_SA_NAME || secrets.OPENSHIFT_SA_NAME_EAO }} - OPENSHIFT_IMAGE_REGISTRY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_IMAGE_REGISTRY || secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }} - OPENSHIFT_REPOSITORY: ${{ github.event.inputs.project_type == 'GDX' && secrets.OPENSHIFT_REPOSITORY || secrets.OPENSHIFT_REPOSITORY_EAO }} + OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }} + OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }} + OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }} + OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }} jobs: notify-api-cd: diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 2f9bcbcc6..cd126d663 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,3 +1,8 @@ +## January 24, 2024 +- **Task** Update default project type to GDX for all deployments by default. [🎟️DESENG-472](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-472) + - Set the default project type to GDX on all continuous deployment (CD) files. + - Removed the option to deploy to EAO. + ## January 22, 2024 - **Task** Add missing unit tests for met api [🎟️DESENG-481](https://apps.itsm.gov.bc.ca/jira/browse/DESENG-481) - Added missing unit tests for met api