Skip to content

Commit 78dc035

Browse files
sakthi-aotmidhun-aotRyanBirtch-aotacoard-aotnikhila-aot
authored
merge to main (#215)
* 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>
1 parent 46f21f1 commit 78dc035

217 files changed

Lines changed: 36549 additions & 4668 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
apiVersion: template.openshift.io/v1
2+
kind: Template
3+
metadata:
4+
name: ${NAME}
5+
annotations:
6+
description: "EPD backend-applications"
7+
tags: "epd-backend"
8+
iconClass: icon-js
9+
labels:
10+
app: ${NAME}-${COMPONENT}
11+
app.kubernetes.io/part-of: ${NAME}-${COMPONENT}
12+
parameters:
13+
- name: NAME
14+
description: Module name
15+
value: epd
16+
- name: COMPONENT
17+
description: Component name
18+
value: backend-applications
19+
- name: IMAGE_TAG
20+
description: Image tag to use
21+
value: latest
22+
- name: DOMAIN
23+
value: apps.silver.devops.gov.bc.ca
24+
- name: CPU_REQUEST
25+
value: "25m"
26+
- name: MEMORY_REQUEST
27+
value: "50Mi"
28+
- name: CPU_LIMIT
29+
value: "75m"
30+
- name: MEMORY_LIMIT
31+
value: "150Mi"
32+
- name: MIN_REPLICAS
33+
description: The minimum amount of replicas
34+
value: "1"
35+
- name: MAX_REPLICAS
36+
description: The maximum amount of replicas
37+
value: "3"
38+
- name: CONTAINER_PORT
39+
description: The port on which the application will be accessible
40+
required: true
41+
- name: REGISTRY
42+
description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
43+
value: ghcr.io
44+
- name: PROMOTE
45+
description: Image (namespace/name:tag) to promote/import
46+
value: bcgov/nr-epd-digital-services/backend/applications
47+
- name: ENV
48+
description: The Environment on which it is deployed
49+
required: true
50+
objects:
51+
- apiVersion: v1
52+
kind: ImageStream
53+
metadata:
54+
labels:
55+
app: ${NAME}-${COMPONENT}
56+
name: ${NAME}-${COMPONENT}
57+
spec:
58+
lookupPolicy:
59+
local: false
60+
tags:
61+
- name: ${IMAGE_TAG}
62+
from:
63+
kind: DockerImage
64+
name: ${REGISTRY}/${PROMOTE}:${IMAGE_TAG}
65+
referencePolicy:
66+
type: Local
67+
- apiVersion: v1
68+
kind: DeploymentConfig
69+
metadata:
70+
labels:
71+
app: ${NAME}-${COMPONENT}
72+
name: ${NAME}-${COMPONENT}
73+
spec:
74+
replicas: 1
75+
triggers:
76+
- type: ConfigChange
77+
- type: ImageChange
78+
imageChangeParams:
79+
automatic: true
80+
containerNames:
81+
- ${NAME}-${COMPONENT}
82+
from:
83+
kind: ImageStreamTag
84+
name: ${NAME}-${COMPONENT}:${IMAGE_TAG}
85+
selector:
86+
deploymentconfig: ${NAME}-${COMPONENT}
87+
strategy:
88+
type: Rolling
89+
template:
90+
metadata:
91+
labels:
92+
app: ${NAME}-${COMPONENT}
93+
deploymentconfig: ${NAME}-${COMPONENT}
94+
spec:
95+
containers:
96+
- image: ${NAME}-${COMPONENT}:${IMAGE_TAG}
97+
imagePullPolicy: Always
98+
name: ${NAME}-${COMPONENT}
99+
env:
100+
- name: POSTGRESQL_HOST
101+
valueFrom:
102+
configMapKeyRef:
103+
name: ${NAME}-database
104+
key: POSTGRESQL_HOST
105+
- name: POSTGRESQL_DATABASE
106+
valueFrom:
107+
configMapKeyRef:
108+
name: ${NAME}-database
109+
key: POSTGRES_DATABASE
110+
- name: POSTGRESQL_PASSWORD
111+
valueFrom:
112+
secretKeyRef:
113+
name: ${NAME}-database
114+
key: POSTGRES_DB_PASSWORD
115+
- name: POSTGRESQL_USER
116+
valueFrom:
117+
secretKeyRef:
118+
name: ${NAME}-database
119+
key: POSTGRES_DB_USERNAME
120+
ports:
121+
- containerPort: ${{CONTAINER_PORT}}
122+
protocol: TCP
123+
resources:
124+
requests:
125+
cpu: ${CPU_REQUEST}
126+
memory: ${MEMORY_REQUEST}
127+
limits:
128+
cpu: ${CPU_LIMIT}
129+
memory: ${MEMORY_LIMIT}
130+
# readinessProbe:
131+
# tcpSocket:
132+
# path: /
133+
# port: ${{CONTAINER_PORT}}
134+
# scheme: HTTP
135+
# initialDelaySeconds: 60
136+
# periodSeconds: 30
137+
# timeoutSeconds: 5
138+
# failureThreshold: 30
139+
# successThreshold: 1
140+
# livenessProbe:
141+
# successThreshold: 1
142+
# failureThreshold: 3
143+
# httpGet:
144+
# path: /
145+
# port: ${{CONTAINER_PORT}}
146+
# scheme: HTTP
147+
# initialDelaySeconds: 60
148+
# periodSeconds: 30
149+
# timeoutSeconds: 5
150+
- apiVersion: v1
151+
kind: Service
152+
metadata:
153+
labels:
154+
app: ${NAME}-${COMPONENT}
155+
name: ${NAME}-${COMPONENT}
156+
spec:
157+
ports:
158+
- name: ${CONTAINER_PORT}-tcp
159+
protocol: TCP
160+
port: 80
161+
targetPort: ${{CONTAINER_PORT}}
162+
selector:
163+
deploymentconfig: ${NAME}-${COMPONENT}
164+
- apiVersion: route.openshift.io/v1
165+
kind: Route
166+
metadata:
167+
labels:
168+
app: ${NAME}-${COMPONENT}
169+
name: ${NAME}-${COMPONENT}
170+
spec:
171+
host: ${NAME}-${COMPONENT}-${ENV}.${DOMAIN}
172+
port:
173+
targetPort: ${CONTAINER_PORT}-tcp
174+
to:
175+
kind: Service
176+
name: ${NAME}-${COMPONENT}
177+
weight: 100
178+
tls:
179+
termination: edge
180+
insecureEdgeTerminationPolicy: Redirect
181+
- apiVersion: autoscaling/v2
182+
kind: HorizontalPodAutoscaler
183+
metadata:
184+
name: "${NAME}-${COMPONENT}"
185+
spec:
186+
scaleTargetRef:
187+
apiVersion: apps.openshift.io/v1
188+
kind: DeploymentConfig
189+
name: "${NAME}-${COMPONENT}"
190+
minReplicas: ${{MIN_REPLICAS}}
191+
maxReplicas: ${{MAX_REPLICAS}}
192+
metrics:
193+
- type: Resource
194+
resource:
195+
name: cpu
196+
target:
197+
type: Utilization
198+
averageUtilization: 100

0 commit comments

Comments
 (0)