Skip to content

Commit 8d87544

Browse files
Feature/grad2 3450 (#540)
* GRAD2-3450 - IAC for Program, Course and Rule Engine APIs * GRAD2-3450 - IAC for Program, Course and Rule Engine APIs * GRAD2-3450 - IAC for Program, Course and Rule Engine APIs * GRAD2-3450 - Added workflow permissions for github token. * GRAD2-3450 - Added workflow permissions for github token.
1 parent 256c1c8 commit 8d87544

9 files changed

+10
-3
lines changed

.github/workflows/build.from.developer.branch.deploy.to.dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
1313
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
1414
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
15+
TARGET_ENV: dev
1516

1617
# 🖊️ EDIT to change the image registry settings.
1718
# Registries such as GHCR, Quay.io, and Docker Hub are supported.

.github/workflows/build.from.main.branch.deploy.to.dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
1313
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
1414
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
15+
TARGET_ENV: dev
1516

1617
# 🖊️ EDIT to change the image registry settings.
1718
# Registries such as GHCR, Quay.io, and Docker Hub are supported.

.github/workflows/build.from.release.branch.deploy.to.dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
1313
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
1414
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
15+
TARGET_ENV: dev
1516

1617
# 🖊️ EDIT to change the image registry settings.
1718
# Registries such as GHCR, Quay.io, and Docker Hub are supported.

.github/workflows/create-clients-and-secrets.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ env:
88
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
99
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
1010
OPENSHIFT_SERVER: ${{ vars.OPENSHIFT_SERVER }}
11-
GRAD_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}-${{ github.event.inputs.environment }}
11+
GRAD_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}
1212
OPENSHIFT_NAMESPACE: ${{ vars.GRAD_NAMESPACE }}-${{ github.event.inputs.environment }}
1313
OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
14+
TARGET_ENV: ${{ github.event.inputs.environment }}
1415

1516
on:
1617
workflow_dispatch:

.github/workflows/deploy_latest_to_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
1313
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
1414
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
15+
TARGET_ENV: test
1516

1617
SPRING_BOOT_IMAGE_NAME: educ-rule-engine-api
1718

.github/workflows/deploy_prod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
1313
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
1414
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
15+
TARGET_ENV: prod
1516

1617
SPRING_BOOT_IMAGE_NAME: educ-rule-engine-api
1718

.github/workflows/deploy_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ env:
1212
BUSINESS_NAMESPACE: ${{ vars.GRAD_BUSINESS_NAMESPACE }}
1313
KEYCLOAK_URL: ${{ secrets.KEYCLOAK_URL }}
1414
KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }}
15+
TARGET_ENV: test
1516

1617
SPRING_BOOT_IMAGE_NAME: educ-rule-engine-api
1718

tools/config/clients-and-scopes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const httpsAgent = new https.Agent({ rejectUnauthorized: false }); // for self-s
1111
const keycloakUrl = process.env.KEYCLOAK_URL;
1212
const realm = process.env.KEYCLOAK_REALM;
1313
const openshiftApi = process.env.OPENSHIFT_SERVER;
14-
const gradNamespace = process.env.GRAD_NAMESPACE;
14+
const gradNamespace = `${process.env.GRAD_NAMESPACE}-${process.env.TARGET_ENV}`;
1515
const openshiftNamespace = process.env.OPENSHIFT_NAMESPACE;
1616
const openshiftToken = process.env.OPENSHIFT_TOKEN;
1717

tools/openshift/fetch-and-create-secrets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const https = require('https');
66
const keycloakUrl = process.env.KEYCLOAK_URL;
77
const realm = process.env.KEYCLOAK_REALM;
88
const openshiftApi = process.env.OPENSHIFT_SERVER;
9-
const gradNamespace = process.env.GRAD_NAMESPACE;
9+
const gradNamespace = `${process.env.GRAD_NAMESPACE}-${process.env.TARGET_ENV}`;
1010
const openshiftNamespace = process.env.OPENSHIFT_NAMESPACE;
1111
const openshiftToken = process.env.OPENSHIFT_TOKEN;
1212

0 commit comments

Comments
 (0)