Skip to content

Commit

Permalink
merge to main (#215)
Browse files Browse the repository at this point in the history
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Fixed unit test cases

* update

* update

* update

* update

* update

* update

* added unit test cases for input validation on user microservice

* update

* update

* update

* update

* update

* update

* update

* deleting the not required files

* commenting frontend unit test for merging

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fixed unit test cases and removed hardcoded url's

* Frontend unit test fix for auth testing

* fixing review comments - moving configuration to environment

* Deleting unused file

* fixing openshift building issues

* update

* Added .env to gitignore

* update

* Fix/ci cd ss20 (#144)

* Work on OpenShift deploy to dev in own branch, test GA triggers

* Comment out unit tests for GA

* Add path trigger for GA

* Test commenting out conditional for triggering deploys

* Update ports for deployments

* Pass in env values for backend gateway

* Add env variables to backend-gateway deploy

* update

* Set autoSchemaFile: true to test builds

* update

* update

* test delayed start issue

* test

* test

* test

* update

* update

* test

* test

* update

* test

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* updated

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* issue_number

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

Co-authored-by: Adam Coard <adam.coard@aot-technologies.com>

* update to prod

* Ignore env file (#145)

* adding .env to git ignore file

* deleted .env from frontend folder

* update

* update

* update

* adding typeOrm.config.ts

* adding initial migration and initDB shell script file

* Fix/ci cd ss20 (#148)

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* removed .env from users

* update

* Added protected routes

* Fixing the password issue with schema role

* CLRF to LF change

* Early forms accordion

* adding wait-on package to graphql gateway

* Added factory for form ingestion

* Ss frontend build (#157)

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* updated

* updated

* updated

* updated

* updated

* updated

* updated

* updated

* update

* Changes for making database init before other docker containers starting

* adding external user entity

* Added responsive designs Need to move login buttons into landing page

* linting, config changes and schema name change

* Prelim landing page complete, css fixes, fixed login issue, protected routes now working correctly

* Responsive Navigation panel css updtates

* updating external user service

* Mostly completed css, need for login panel

* Finished css landing, ready for UI/UX Review

* Formatting done on all files -  backend

* Cleanup

* cleanup 2

* fixed tests

* Fixed lint errors and warning , updated folder name

* Fixed sonarcloud bug

* Fixed sonarcloud code smells

* Fixed sonarcloud code smells 2

* changed file names and migration folder location

* Added new testing for dashboard

* Adding graphql field attribute

* Adding Code Comments, Refining folder & file name

* Fixes from UI/UX Review

* Fixed header login button

* Updating unit test cases for users microservices

* Added login to header and responsiveness improvements

* Resizing bug in header

* Fixing sonar code comments

* changed idp hint

* Sonarcloud Fixes

* update

* Moved into components folder

* build issues fix

* update

* update

* update

* Form and readonly functionality

* update

* update

* Fixes to navigation to profile page

* update

* update

* update

* update

* update

* update

* update

* Fixes to login panel, continued work on userprofile

* minor css changes

* update

* update

* Form structure complete

* update

* update

* update

* Added billing form

* graphql doc using spectaql

* Changes for validting profile verification status

* update

* update

* testing fix for deployment issue (#169)

* update

* Feat/refine docker (#172)

* testing fix for deployment issue

* refining docker file

* changed to pull from govt repo

* Feat/refine docker (#173)

* testing fix for deployment issue

* refining docker file

* changed to pull from govt repo

* reverted to pull node image

* update

* Update External User Api - updated

* Added profile slice which includes fetching organization types and regions. Needing to integrate with the frontend still

* Feat/refine docker (#175)

* testing fix for deployment issue

* refining docker file

* changed to pull from govt repo

* reverted to pull node image

* changed docker steps

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Changes for Integrating Create User Page and API

* commenting options

* Ss frontend configmap (#180)

* update

* update

* Ss frontend configmap (#181)

* update

* update

* update

* Handling IDIR user login and adding required fields

* added config changes

* handling lookupdata and updated folder structure

* Changes update user profile

* Cleanup

* Fix to select region issues with preloaded user

* Fixing the select issue

* Ss frontend configmap (#186)

* update

* update

* update

* update

* update

* update

* update

* Button Recolour for logged in user, submit user in profile page, and added conditional back button

* Changes for toast messages , css issues

* Cleaning up the code

* Pull init data from auth.user.profile

* Fixing issue with saving region

* Early Regex Work

* regex complete

* required field validations and error message

* fixes for regex

* fixes for regex2

* added regex for postal code

* Regex fixes

* Ss frontend configmap (#196)

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update (#197)

* Adding validations

* changes to ci cd (#202)

* 153 profile screen (#203)

* changes to ci cd

* changed to tab

* 153 profile screen (#204)

* changes to ci cd

* changed to tab

* commented code

* update

* update

* update

* update

* update

* update

* update

* update

* update

* Added window environment vars to logout

* update

* update

* update

* update

* removed client secret

* resolved unit test issues

* removed console logs

* update

* update

* Adding unit test cases

* Ss 79 (#213)

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

Co-authored-by: midhun-aot <midhun.murali@aot-technologies.com>
Co-authored-by: RyanBirtch-aot <104386035+RyanBirtch-aot@users.noreply.github.com>
Co-authored-by: RyanBirtch-aot <ryan.birtch@aot-technologies.com>
Co-authored-by: midhun-aot <105463561+midhun-aot@users.noreply.github.com>
Co-authored-by: Adam Coard <adam.coard@aot-technologies.com>
Co-authored-by: acoard-aot <61285798+acoard-aot@users.noreply.github.com>
Co-authored-by: nikhila-aot <nikhila.pankaj@aot-technologies.com>
Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
  • Loading branch information
9 people authored Dec 16, 2022
1 parent 46f21f1 commit 78dc035
Show file tree
Hide file tree
Showing 217 changed files with 36,549 additions and 4,668 deletions.
198 changes: 198 additions & 0 deletions .github/openshift/deploy.backend-applications.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
apiVersion: template.openshift.io/v1
kind: Template
metadata:
name: ${NAME}
annotations:
description: "EPD backend-applications"
tags: "epd-backend"
iconClass: icon-js
labels:
app: ${NAME}-${COMPONENT}
app.kubernetes.io/part-of: ${NAME}-${COMPONENT}
parameters:
- name: NAME
description: Module name
value: epd
- name: COMPONENT
description: Component name
value: backend-applications
- name: IMAGE_TAG
description: Image tag to use
value: latest
- name: DOMAIN
value: apps.silver.devops.gov.bc.ca
- name: CPU_REQUEST
value: "25m"
- name: MEMORY_REQUEST
value: "50Mi"
- name: CPU_LIMIT
value: "75m"
- name: MEMORY_LIMIT
value: "150Mi"
- name: MIN_REPLICAS
description: The minimum amount of replicas
value: "1"
- name: MAX_REPLICAS
description: The maximum amount of replicas
value: "3"
- name: CONTAINER_PORT
description: The port on which the application will be accessible
required: true
- name: REGISTRY
description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
value: ghcr.io
- name: PROMOTE
description: Image (namespace/name:tag) to promote/import
value: bcgov/nr-epd-digital-services/backend/applications
- name: ENV
description: The Environment on which it is deployed
required: true
objects:
- apiVersion: v1
kind: ImageStream
metadata:
labels:
app: ${NAME}-${COMPONENT}
name: ${NAME}-${COMPONENT}
spec:
lookupPolicy:
local: false
tags:
- name: ${IMAGE_TAG}
from:
kind: DockerImage
name: ${REGISTRY}/${PROMOTE}:${IMAGE_TAG}
referencePolicy:
type: Local
- apiVersion: v1
kind: DeploymentConfig
metadata:
labels:
app: ${NAME}-${COMPONENT}
name: ${NAME}-${COMPONENT}
spec:
replicas: 1
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- ${NAME}-${COMPONENT}
from:
kind: ImageStreamTag
name: ${NAME}-${COMPONENT}:${IMAGE_TAG}
selector:
deploymentconfig: ${NAME}-${COMPONENT}
strategy:
type: Rolling
template:
metadata:
labels:
app: ${NAME}-${COMPONENT}
deploymentconfig: ${NAME}-${COMPONENT}
spec:
containers:
- image: ${NAME}-${COMPONENT}:${IMAGE_TAG}
imagePullPolicy: Always
name: ${NAME}-${COMPONENT}
env:
- name: POSTGRESQL_HOST
valueFrom:
configMapKeyRef:
name: ${NAME}-database
key: POSTGRESQL_HOST
- name: POSTGRESQL_DATABASE
valueFrom:
configMapKeyRef:
name: ${NAME}-database
key: POSTGRES_DATABASE
- name: POSTGRESQL_PASSWORD
valueFrom:
secretKeyRef:
name: ${NAME}-database
key: POSTGRES_DB_PASSWORD
- name: POSTGRESQL_USER
valueFrom:
secretKeyRef:
name: ${NAME}-database
key: POSTGRES_DB_USERNAME
ports:
- containerPort: ${{CONTAINER_PORT}}
protocol: TCP
resources:
requests:
cpu: ${CPU_REQUEST}
memory: ${MEMORY_REQUEST}
limits:
cpu: ${CPU_LIMIT}
memory: ${MEMORY_LIMIT}
# readinessProbe:
# tcpSocket:
# path: /
# port: ${{CONTAINER_PORT}}
# scheme: HTTP
# initialDelaySeconds: 60
# periodSeconds: 30
# timeoutSeconds: 5
# failureThreshold: 30
# successThreshold: 1
# livenessProbe:
# successThreshold: 1
# failureThreshold: 3
# httpGet:
# path: /
# port: ${{CONTAINER_PORT}}
# scheme: HTTP
# initialDelaySeconds: 60
# periodSeconds: 30
# timeoutSeconds: 5
- apiVersion: v1
kind: Service
metadata:
labels:
app: ${NAME}-${COMPONENT}
name: ${NAME}-${COMPONENT}
spec:
ports:
- name: ${CONTAINER_PORT}-tcp
protocol: TCP
port: 80
targetPort: ${{CONTAINER_PORT}}
selector:
deploymentconfig: ${NAME}-${COMPONENT}
- apiVersion: route.openshift.io/v1
kind: Route
metadata:
labels:
app: ${NAME}-${COMPONENT}
name: ${NAME}-${COMPONENT}
spec:
host: ${NAME}-${COMPONENT}-${ENV}.${DOMAIN}
port:
targetPort: ${CONTAINER_PORT}-tcp
to:
kind: Service
name: ${NAME}-${COMPONENT}
weight: 100
tls:
termination: edge
insecureEdgeTerminationPolicy: Redirect
- apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: "${NAME}-${COMPONENT}"
spec:
scaleTargetRef:
apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
name: "${NAME}-${COMPONENT}"
minReplicas: ${{MIN_REPLICAS}}
maxReplicas: ${{MAX_REPLICAS}}
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 100
Loading

0 comments on commit 78dc035

Please sign in to comment.