Demo PR - Do not merge

.github/workflows/demo-openshift.yml

@@ -4,13 +4,13 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'vdyp-web-ui/**'
-      - 'vdyp-api/**'
-      - 'vdyp-buildtools/migrations'
-
+      - "frontend/**"
+      - "backend/**"
+      - "migrations/**"
+      - "vdyp-web-ui/**"
 concurrency:
-  # Cancel in progress for PR open and close
-  group: ${{ github.event.number }}
+  # Cancel if re-attempted
+  group: ${{ github.event_name }}
   cancel-in-progress: true
 
 jobs:
@@ -20,13 +20,12 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [vdyp-api/backend, vdyp-web-ui/frontend, vdyp-buildtools/migrations]
+        package: [backend, frontend, migrations, vdyp-web-ui]
     timeout-minutes: 10
     steps:
-      - uses: bcgov-nr/action-builder-ghcr@v2.0.2
+      - uses: bcgov-nr/action-builder-ghcr@v2.2.0
         with:
-          build_context: ${{ matrix.build_context }}
-          keep_versions: 10
+          keep_versions: 50
           package: ${{ matrix.package }}
           tag: ${{ github.event.number }}
           tag_fallback: latest
@@ -36,14 +35,13 @@ jobs:
   deploys:
     name: Deploys
     needs: [builds]
-    uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.4.1
+    uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.6.1
     secrets:
       oc_namespace: ${{ secrets.OC_NAMESPACE }}
       oc_token: ${{ secrets.OC_TOKEN }}
     with:
-      triggers: ('vdyp-api/backend/' 'vdyp-web-ui/frontend/' 'vdyp-tools/migrations/')
-      params:
-        --set global.secrets.persist=false
+      triggers: ('backend/' 'frontend/' 'migrations/' 'vdyp-web-ui/')
+      params: --set global.secrets.persist=false
 
   # tests:
   #   name: Tests

.github/workflows/docker.yml

@@ -0,0 +1,70 @@
+permissions:
+  contents: read
+  packages: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      BUILD_TARGET:
+        type: choice
+        description: 'Name of project to build'
+        options:
+          - vdyp-web-ui
+        required: true
+      TAG:
+        required: false
+        type: string
+        default: "latest"
+        description: 'Additional tag to add to docker image'
+
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Github Container Repository
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - id: trimBranchName
+        name: trim branch name if necessary
+        run: |
+          export branchTag="${{ github.ref_name }}"
+          trimTag="${branchTag##*/}"
+          echo "BRANCH_TAG=$trimTag" >> $GITHUB_OUTPUT
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta_pr
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ghcr.io/${{ github.repository }}-${{ inputs.BUILD_TARGET }}
+          tags: |
+            type=schedule
+            type=raw,value=${{ steps.trimBranchName.outputs.BRANCH_TAG }}
+            type=ref,event=tag
+            type=raw,value=${{ inputs.TAG }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: ./${{inputs.BUILD_TARGET}}
+          push: true
+          tags: ${{ steps.meta_pr.outputs.tags }}
+          labels: ${{ steps.meta_pr.outputs.labels }}
+
+

.github/workflows/openshift-deploy-web-ui-dev.yml

@@ -0,0 +1,52 @@
+name: Deploy web-ui to Openshift Dev
+on:
+  workflow_dispatch:
+    inputs:
+      TAG:
+        required: false
+        description: The docker image to deploy e.g. 1.0.0, 1.1.2, etc
+        type: string
+        default: latest
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment:
+      name: dev # read secrets from test environment in github.
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Copy openshift yaml files
+        run: mkdir staging && cp openshift/vdyp-web-ui*.yaml staging/
+
+      - name: Fill yaml files
+        uses: cschleiden/[email protected]
+        with:
+          files: staging/**.yaml
+        env:
+          #Common variables
+          ENV: dev
+          NAMESPACE: ${{ vars.OC_NAMESPACE }}
+          TAG: ${{ inputs.TAG }}
+
+          #Frontend variables
+          ACTIVE_PORT: ${{ vars.TARGET_PORT }}
+          LOG_LEVEL: ${{ vars.LOG_LEVEL }}
+          BACKEND_URL: ${{ vars.BACKEND_URL }}
+
+      - name: Authenticate and set context
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{secrets.OPENSHIFT_SERVER_URL}}
+          openshift_token: ${{secrets.OC_TOKEN}}
+          namespace: ${{ vars.OC_NAMESPACE }}
+
+      - name: Apply .yaml files to openshift
+        run: |
+          for file in staging/*
+          do
+            oc apply -f "$file"
+          done

vdyp-web-ui/frontend/package.json → frontend/package.json

@@ -24,6 +24,7 @@
     "@vitejs/plugin-react": "^4.0.0",
     "axios": "^1.6.8",
     "mui-datatables": "^4.3.0",
+    "quickstart-openshift-react-frontend": "file:",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router": "^6.12.1",
@@ -46,8 +47,8 @@
     "cypress-file-upload": "^5.0.8",
     "cypress-plugin-api": "^2.11.1",
     "eslint": "^8.57.0",
-    "eslint-config-prettier": "^9.0.0",
     "eslint-config-love": "^48.0.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-cypress": "^2.13.3",

openshift/vdyp-web-ui-configmap.yaml

@@ -0,0 +1,14 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: vdyp-web-ui-config-#{ENV}#
+  namespace: "#{NAMESPACE}#"
+  managedFields:
+    - manager: Mozilla
+      operation: Update
+      apiVersion: v1
+      time: "2024-04-15T22:11:17Z"
+      fieldsType: FieldsV1
+immutable: false
+data:
+  ACTIVE_PORT: "#{ACTIVE_PORT}#"

openshift/vdyp-web-ui-deployment.yaml

@@ -0,0 +1,49 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: "#{NAMESPACE}#"
+  name: "vdyp-web-ui-deployment-#{ENV}#"
+spec:
+  selector:
+    matchLabels:
+      app: vdyp-web-ui-#{ENV}#
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        app: vdyp-web-ui-#{ENV}#
+        project: vdyp-#{ENV}#
+    spec:
+      containers:
+        - name: container
+          image: >-
+            ghcr.io/vivid-cpreston/nr-vdyp-vdyp-web-ui:latest
+          ports:
+            - containerPort: #{ACTIVE_PORT}#
+              protocol: TCP
+          env:
+            - name: ACTIVE_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: vdyp-web-ui-config-#{ENV}#
+                  key: ACTIVE_PORT
+            - name: LOG_LEVEL
+              value: "#{LOG_LEVEL}#"
+            - name: BACKEND_URL
+              value: "#{BACKEND_URL}#"
+          securityContext:
+            capabilities:
+              add:
+                - NET_BIND_SERVICE              
+          resources:
+            requests:
+              cpu: 100m
+              memory: 200Mi
+            limits:
+              cpu: 200m
+              memory: 400Mi
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 50%
+      maxUnavailable: 50%

openshift/vdyp-web-ui-egress.yaml

@@ -0,0 +1,13 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: vdyp-web-ui-egress-#{ENV}#
+  namespace: "#{NAMESPACE}#"
+spec:
+  podSelector:
+    matchLabels:
+      app: vdyp-web-ui-#{ENV}#
+  policyTypes:
+    - Egress
+  egress:
+    - {}

openshift/vdyp-web-ui-route.yaml

@@ -0,0 +1,17 @@
+kind: Route
+apiVersion: route.openshift.io/v1
+metadata:
+  name: vdyp-web-ui-route-#{ENV}#
+  namespace: "#{NAMESPACE}#"
+  labels: {}
+spec:
+  host: vdyp-ui-dev.apps.silver.devops.gov.bc.ca
+  to:
+    kind: Service
+    name: vdyp-web-ui-service-#{ENV}#
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
+    destinationCACertificate: ""
+  port:
+    targetPort: #{ACTIVE_PORT}#

openshift/vdyp-web-ui-service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: vdyp-web-ui-service-#{ENV}#
+  namespace: "#{NAMESPACE}#"
+spec:
+  selector:
+    app: vdyp-web-ui-#{ENV}#
+  ports:
+    - protocol: TCP
+      port: #{ACTIVE_PORT}#
+      targetPort: #{ACTIVE_PORT}#

vdyp-buildtools/tests/integration/package.json

@@ -9,6 +9,7 @@
   "dependencies": {
     "axios": "^1.6.8",
     "dotenv": "^16.3.1",
+    "integration-tests": "file:",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21"
   }