From c6bd099f4e4b37ba959bcfbe51c2507ba61771d5 Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:58:03 -0800 Subject: [PATCH 1/5] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 5a0c04cd..9a1e2989 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-batch-graduation-api - 1.8.56 + 1.8.58 educ-grad-batch-graduation-api Ministry of Education GRAD BATCH GRADUATION API From 84c61e10d69bafb1a4d594cb93719b537826d81f Mon Sep 17 00:00:00 2001 From: Jinil Sung Date: Tue, 12 Mar 2024 14:40:42 -0700 Subject: [PATCH 2/5] GRAD2-2545: task is complete. (#468) GRAD2-2545: task is complete. --- tools/config/update-configmap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh index c82e11b0..d9a044fc 100644 --- a/tools/config/update-configmap.sh +++ b/tools/config/update-configmap.sh @@ -71,6 +71,7 @@ oc create -n "$OPENSHIFT_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map --from-literal=NUMBER_OF_PARTITIONS="10" \ --from-literal=KEYCLOAK_TOKEN_URL="https://soam-$envValue.apps.silver.devops.gov.bc.ca/" \ --from-literal=REG_ALG_CRON="0 30 18 * * *" \ + --from-literal=RECORDS_STALE_IN_DAYS="1095" \ --dry-run=client -o yaml | oc apply -f - echo Creating config map "$APP_NAME"-flb-sc-config-map From daafa8210700bb7e177f0726b98dc97344805a8f Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Wed, 20 Mar 2024 10:17:22 -0700 Subject: [PATCH 3/5] Updated configs to resolve HPA alerts and fixed unrelated API Doc issue --- .../workflows/build.from.developer.branch.deploy.to.dev.yml | 2 +- .github/workflows/build.from.main.branch.deploy.to.dev.yml | 2 +- .github/workflows/build.from.release.branch.deploy.to.dev.yml | 2 +- .github/workflows/deploy_prod.yml | 2 +- .github/workflows/deploy_test.yml | 2 +- .gitignore | 3 ++- .../api/batchgraduation/controller/JobLauncherController.java | 4 ++-- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml index fed643e1..ca249423 100644 --- a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml @@ -27,7 +27,7 @@ env: MAX_CPU: "300m" MIN_MEM: "1024Mi" MAX_MEM: "4Gi" - MIN_REPLICAS: "3" + MIN_REPLICAS: "2" MAX_REPLICAS: "3" on: diff --git a/.github/workflows/build.from.main.branch.deploy.to.dev.yml b/.github/workflows/build.from.main.branch.deploy.to.dev.yml index 491a45eb..2379fb73 100644 --- a/.github/workflows/build.from.main.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.main.branch.deploy.to.dev.yml @@ -27,7 +27,7 @@ env: MAX_CPU: "300m" MIN_MEM: "1024Mi" MAX_MEM: "4Gi" - MIN_REPLICAS: "3" + MIN_REPLICAS: "2" MAX_REPLICAS: "3" on: diff --git a/.github/workflows/build.from.release.branch.deploy.to.dev.yml b/.github/workflows/build.from.release.branch.deploy.to.dev.yml index d7e54483..bc10c94b 100644 --- a/.github/workflows/build.from.release.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.release.branch.deploy.to.dev.yml @@ -27,7 +27,7 @@ env: MAX_CPU: "300m" MIN_MEM: "1024Mi" MAX_MEM: "4Gi" - MIN_REPLICAS: "3" + MIN_REPLICAS: "2" MAX_REPLICAS: "3" on: diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 3f3dcd45..a6cb4d19 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -22,7 +22,7 @@ env: MIN_MEM: "1024Mi" MAX_MEM: "4Gi" MIN_REPLICAS: "3" - MAX_REPLICAS: "3" + MAX_REPLICAS: "4" on: diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml index c1b11b13..533df8c0 100644 --- a/.github/workflows/deploy_test.yml +++ b/.github/workflows/deploy_test.yml @@ -22,7 +22,7 @@ env: MIN_MEM: "1024Mi" MAX_MEM: "4Gi" MIN_REPLICAS: "3" - MAX_REPLICAS: "3" + MAX_REPLICAS: "4" on: diff --git a/.gitignore b/.gitignore index 07c41426..9ef8b154 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,5 @@ target/ build/ ### VS Code ### -.vscode/ \ No newline at end of file +.vscode/ +api/application-local.yaml diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java index ca96c610..45464f60 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java +++ b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java @@ -608,7 +608,7 @@ public ResponseEntity loadSummary(@RequestParam(name = "pageNu @PostMapping(EducGradBatchGraduationApiConstants.EXECUTE_SPECIALIZED_USER_REQ_RUNS) @PreAuthorize(PermissionsConstants.RUN_GRAD_ALGORITHM) - @Operation(summary = "Run Specialized TVR Runs", description = "Run specialized Distribution runs", tags = { "DISTRIBUTION" }) + @Operation(summary = "Run Specialized TVR Runs", description = "Run specialized Distribution runs", tags = { "Distribution" }) @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),@ApiResponse(responseCode = "500", description = "Internal Server Error")}) public ResponseEntity launchUserReqDisRunSpecialJob(@PathVariable String credentialType, @RequestBody StudentSearchRequest studentSearchRequest) { logger.debug("launchUserReqDisRunSpecialJob"); @@ -645,7 +645,7 @@ public ResponseEntity launchUserReqDisRunSpecialJob(@Pat @PostMapping(EducGradBatchGraduationApiConstants.EXECUTE_SPECIALIZED_BLANK_USER_REQ_RUNS) @PreAuthorize(PermissionsConstants.RUN_GRAD_ALGORITHM) - @Operation(summary = "Run Specialized User Req Runs", description = "Run specialized Distribution runs", tags = { "DISTRIBUTION" }) + @Operation(summary = "Run Specialized User Req Runs", description = "Run specialized Distribution runs", tags = { "Distribution" }) @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),@ApiResponse(responseCode = "500", description = "Internal Server Error")}) public ResponseEntity launchUserReqBlankDisRunSpecialJob(@RequestBody BlankCredentialRequest blankCredentialRequest, @PathVariable String credentialType) { logger.debug("launchUserReqDisRunSpecialJob"); From ba2a8e69660864d3517c64d2f190484a114ef262 Mon Sep 17 00:00:00 2001 From: "chris.ditcher" Date: Wed, 20 Mar 2024 10:27:06 -0700 Subject: [PATCH 4/5] Removed show-sql as per Jinil's request. --- api/src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index 39be3638..f4a20368 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -15,7 +15,7 @@ spring: password: ${PASSWORD} driver-class-name: oracle.jdbc.driver.OracleDriver jpa: - show-sql: true + show-sql: false database-platform: org.hibernate.dialect.OracleDialect hibernate: ddl-auto: none From d01a3ce4a80818190bdf5f9e6492a09b02555d20 Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:53:23 -0700 Subject: [PATCH 5/5] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 9a1e2989..58992cad 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-batch-graduation-api - 1.8.58 + 1.8.59 educ-grad-batch-graduation-api Ministry of Education GRAD BATCH GRADUATION API