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.

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

feat(4550): implement maintenance mode support #4801

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2ef4442
feat(4550): implement maintenance mode support
Kolezhanchik Jan 30, 2025
2b7d7e7
fix(4802): resolve EMou Authority information discrepancy
junminahn Jan 30, 2025
2c6c16a
Merge pull request #4803 from bcgov/fix/4802
junminahn Jan 30, 2025
35d58fc
fix(deps): update tiptap monorepo to v2.11.4
renovate[bot] Jan 30, 2025
8b4ac66
chore: release candidate v0.43.9
funtigr Jan 30, 2025
f6bb115
Merge pull request #4806 from bcgov/changelog/0.43.9
funtigr Jan 30, 2025
3813056
fix(deps): update dependency tailwind-merge to v3
renovate[bot] Jan 30, 2025
d9c7c7b
Merge pull request #4804 from bcgov/renovate/tiptap-monorepo
funtigr Jan 30, 2025
5c9dcd2
chore(deps): update github/codeql-action digest to 0701025
renovate[bot] Jan 30, 2025
a347c3a
Merge pull request #4808 from bcgov/renovate/tailwind-merge-3.x
funtigr Jan 30, 2025
3fe4d14
Merge pull request #4807 from bcgov/renovate/github-codeql-action-digest
funtigr Jan 30, 2025
06ccac1
feat(4740): deploy developer docs in GitHub Pages
junminahn Jan 30, 2025
b960af4
Merge pull request #4809 from bcgov/feat/4740
junminahn Jan 30, 2025
535fe9b
chore(4740): check github page deploy action version
junminahn Jan 30, 2025
7c8ef99
chore(4740): update MKDocs configuration
junminahn Jan 31, 2025
eab1218
chore(4740): update MKDocs configuration cont'
junminahn Jan 31, 2025
2ac5b01
chore(4740): update MKDocs configuration cont'
junminahn Jan 31, 2025
6f6fd10
chore(4740): finalize MKDocs configuration
junminahn Jan 31, 2025
f2570e4
Merge pull request #4810 from bcgov/feat/4740
junminahn Jan 31, 2025
a840edb
chore(4550): move maintenance mode helm template to app
Kolezhanchik Jan 31, 2025
573439d
chore(4550): revert .github/workflows/deploy-dev.yml changes
Kolezhanchik Jan 31, 2025
b1bcb62
chore(4550): remove aintenance-mode dependency from helm chart
Kolezhanchik Jan 31, 2025
6a28d03
chore(4550): configure nginx for nonroot user in maintenance mode
Kolezhanchik Jan 31, 2025
6d19c8a
chore(4550): use same user name for nginc.conf
Kolezhanchik Jan 31, 2025
9c46359
chore(4550): resolve merge conflicts
Kolezhanchik Jan 31, 2025
f97e1d9
chore(4550): resolve merge conflicts
Kolezhanchik Jan 31, 2025
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
2 changes: 1 addition & 1 deletion .github/actions/scan-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:
severity: LOW,MEDIUM,HIGH,CRITICAL

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@e9987ad0c1d193b03a7dd5e76c24631552dd1a94
uses: github/codeql-action/upload-sarif@0701025a8b1600e416be4f3bb5a830b1aa6af01e
continue-on-error: true
with:
sarif_file: trivy-results.sarif
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/deploy-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ on:
description: Image Tag Version (ghcr.io/bcgov/pltsvc:<imageTag>)
type: string
required: true
maintenanceMode:
description: Toggle Maintenance Mode
type: boolean
required: false
default: false

jobs:
deploy:
Expand All @@ -35,7 +40,19 @@ jobs:
namespace: ${{ vars.OPENSHIFT_NAMESPACE }}
insecure_skip_tls_verify: true

- name: Toggle Maintenance Mode
if: ${{ inputs.maintenanceMode }}
run: |
helm upgrade \
pltsvc-maintenance-mode \
./helm/main \
-n ${{ vars.OPENSHIFT_NAMESPACE }} \
--set maintenanceMode.enabled=true \
--set app.replicaCount=0 \
--set maintenanceMode.image.tag=${{ inputs.imageTag }}

- name: Deploy apps with Helm chart
if: ${{ !inputs.maintenanceMode }}
run: |
make upgrade \
NAMESPACE=${{ vars.OPENSHIFT_NAMESPACE }} \
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: 50. Publish MkDocs in GitHub Pages

on:
push:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: write

jobs:
mkdocs:
runs-on: ubuntu-22.04
timeout-minutes: 5
steps:
- uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6
- uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2

- name: Setup Tools
uses: ./.github/actions/setup-tools

- name: Build 📦
run: |
make mk-build
touch site/.nojekyll

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@15de0f09300eea763baee31dff6c6184995c5f6a
with:
folder: site
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ yarn-error.log*
next-env.d.ts
mnt
tmp
site
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## [0.43.9](https://github.com/bcgov/platform-services-registry/compare/v0.43.8...v0.43.9) (2025-01-30)

### Features

* **3116:** add MS365 mock integration test ([22124f0](https://github.com/bcgov/platform-services-registry/commit/22124f00f6ddaa1de5a45fdf7a4762c358f25188))
* **3162:** implement integration tests for email workflows ([5c382cb](https://github.com/bcgov/platform-services-registry/commit/5c382cb639eddd2d8a37c987125c73a984f50ed9))
* **4216:** upgrade MongoDB & Backup container versions ([2aee00a](https://github.com/bcgov/platform-services-registry/commit/2aee00ab2570d6db0fdcadaf06b82716492d6c4e))
* **4749:** redirect 404 page to home page ([971be62](https://github.com/bcgov/platform-services-registry/commit/971be62b0b30197b52887266f4b07ba9cefc23b8))
* **4771:** add data migration for Webhook URL duplication ([936dd37](https://github.com/bcgov/platform-services-registry/commit/936dd37f2d9e1e6b8bcf4fa4e7c69f4c7d95fcf0))

### Bug Fixes

* **4802:** resolve EMou Authority information discrepancy ([2b7d7e7](https://github.com/bcgov/platform-services-registry/commit/2b7d7e720bd8f8c9e328ca0a79661efb714a5262))

### End-to-end Testing

* **4311:** add delete request and delete approval tests public cloud ([2cab756](https://github.com/bcgov/platform-services-registry/commit/2cab7563d9a82fed98a9cbbcc2af161c8b0abeed))
* **4311:** exceed timeout for e2e github action ([874f937](https://github.com/bcgov/platform-services-registry/commit/874f937c887f98a63db6409befc657be7cc1d665))
## [0.43.8](https://github.com/bcgov/platform-services-registry/compare/v0.43.7...v0.43.8) (2025-01-25)

### Features
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,11 @@ copy-db:
.PHONY: format-python
format-python:
autopep8 --in-place --recursive .

.PHONY: mk-serve
mk-serve:
mkdocs serve

.PHONY: mk-build
mk-build:
mkdocs build
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.43.8
0.43.9
12 changes: 6 additions & 6 deletions app/helpers/pdfs/emou/BillingMou.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,22 +209,22 @@ export default function BillingMou({ product, billing }: { product: Product; bil
<td colSpan={2}>The Ministry’s Expense Authority</td>
</tr>
<tr>
<td>Name</td>
<td>{formatFullName(billing.signedBy)}</td>
<td>Name</td>
<td>{formatFullName(billing.approvedBy)}</td>
<td>Name</td>
<td>{formatFullName(billing.signedBy)}</td>
</tr>
<tr>
<td>Position Title</td>
<td>{billing.signedBy?.jobTitle || ''}</td>
<td>Position Title</td>
<td>{billing.approvedBy?.jobTitle || ''}</td>
<td>Position Title</td>
<td>{billing.signedBy?.jobTitle || ''}</td>
</tr>
<tr>
<td>Branch</td>
<td>{billing.signedBy?.officeLocation || ''}</td>
<td>Branch</td>
<td>{billing.approvedBy?.officeLocation || ''}</td>
<td>Branch</td>
<td>{billing.signedBy?.officeLocation || ''}</td>
</tr>
</table>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pltsvc-app",
"description": "B.C. Government's Platform Product Registry - App",
"version": "0.43.8",
"version": "0.43.9",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down Expand Up @@ -86,7 +86,7 @@
"react-select": "^5.7.3",
"sanitize-html": "^2.13.1",
"sharp": "^0.33.0",
"tailwind-merge": "^2.5.4",
"tailwind-merge": "^3.0.0",
"tailwindcss": "^3.3.2",
"tw-to-css": "^0.0.12",
"valtio": "^2.0.0",
Expand Down
Loading