Skip to content

Commit 324c70c

Browse files
sakthi-aotsakthi-aot
committed
test migrate
1 parent fd18cb6 commit 324c70c

File tree

3 files changed

+76
-40
lines changed

3 files changed

+76
-40
lines changed

‎.github/openshift/deploy.backend-applications.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ objects:
8383
name: ${REGISTRY}/${INIT_IMAGE}:${IMAGE_TAG}
8484
referencePolicy:
8585
type: Local
86-
- apiVersion: apps/v1
87-
kind: Deployment
86+
- apiVersion: v1
87+
kind: DeploymentConfig
8888
metadata:
8989
labels:
9090
app: ${NAME}-${COMPONENT}
@@ -102,16 +102,14 @@ objects:
102102
kind: ImageStreamTag
103103
name: ${NAME}-${COMPONENT}:${IMAGE_TAG}
104104
selector:
105-
matchLabels:
106-
app: ${NAME}-${COMPONENT}
107-
deployment: ${NAME}-${COMPONENT}
105+
deploymentconfig: ${NAME}-${COMPONENT}
108106
strategy:
109-
type: RollingUpdate
107+
type: Rolling
110108
template:
111109
metadata:
112110
labels:
113111
app: ${NAME}-${COMPONENT}
114-
deployment: ${NAME}-${COMPONENT}
112+
deploymentconfig: ${NAME}-${COMPONENT}
115113
spec:
116114
containers:
117115
- image: " "
@@ -283,7 +281,7 @@ objects:
283281
port: 80
284282
targetPort: ${{CONTAINER_PORT}}
285283
selector:
286-
deployment: ${NAME}-${COMPONENT}
284+
deploymentconfig: ${NAME}-${COMPONENT}
287285
- apiVersion: route.openshift.io/v1
288286
kind: Route
289287
metadata:
@@ -307,8 +305,8 @@ objects:
307305
name: "${NAME}-${COMPONENT}"
308306
spec:
309307
scaleTargetRef:
310-
apiVersion: apps/v1
311-
kind: Deployment
308+
apiVersion: apps.openshift.io/v1
309+
kind: DeploymentConfig
312310
name: "${NAME}-${COMPONENT}"
313311
minReplicas: ${{MIN_REPLICAS}}
314312
maxReplicas: ${{MAX_REPLICAS}}

‎.github/openshift/deploy.frontend.yml‎

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ apiVersion: template.openshift.io/v1
22
kind: Template
33
metadata:
44
name: ${NAME}
5-
annotations:
6-
description: "EPD Digital Services"
7-
tags: "EPD"
8-
iconClass: icon-js
9-
labels:
10-
app: ${NAME}-${COMPONENT}
11-
app.kubernetes.io/part-of: ${NAME}-${COMPONENT}
5+
labels:
6+
app: ${NAME}-${COMPONENT}
7+
app.kubernetes.io/part-of: ${NAME}-${COMPONENT}
128
parameters:
139
- name: NAME
1410
description: Module name
@@ -51,13 +47,66 @@ parameters:
5147
description: "The keycloak client id"
5248
value: epd-web
5349
objects:
54-
# ConfigMap created by sakthi for testing - DONOT push
5550
- apiVersion: v1
5651
kind: ConfigMap
5752
metadata:
5853
name: ${NAME}epd-config
5954
data:
60-
config.js: "// runtime-config.js vars\n window[\"_env_\"] = {\n \"REACT_APP_NODE_ENV\": \"production\",\n \"REACT_APP_AUTH_AUTHORITY\": \"https://epd-keycloak-${ENV}.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/\",\n \"REACT_APP_AUTH_CLIENT_ID\": \"${REACT_APP_AUTH_CLIENT_ID}\",\n \"REACT_APP_AUTH_REDIRECT_URI\": \"https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca/dashboard\", \n \"REACT_APP_AUTH_LOGOUT_REDIRECT_URI\": \"https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://epd-keycloak-${ENV}.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/protocol/openid-connect/logout?post_logout_redirect_uri=https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca\",\n \"REACT_APP_AUTH_RESPONSE_TYPE\": \"code\",\n \"REACT_APP_AUTH_SCOPE\": \"openid profile\",\n \"REACT_APP_BACKEND_API\": \"https://epd-backend-gateway-${ENV}.apps.silver.devops.gov.bc.ca\", \n \"REACT_APP_AUTH_FILTER_PROTOCOL_CLAIMS\": \"true\",\n \"REACT_APP_AUTH_LOAD_USER_INFO\": \"true\", \n \"REACT_APP_AUTH_REVOKE_TOKENS_ON_SIGNOUT\": \"true\",\n \"REACT_APP_FORMSFLOW_WEB_URL\": \"https://forms-flow-web-root-config-${ENV}.apps.silver.devops.gov.bc.ca/\",\n \"REACT_APP_CUSTOM_MAP_URL\": \"https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca/map\",\n \"REACT_APP_BACKEND_USERS_API\": \"https://epd-backend-users-${ENV}.apps.silver.devops.gov.bc.ca/\",\n \"REACT_APP_BCBOX_BASE_URL\": \"https://common-object-management-service-coms-custom-e38158-${ENV}.apps.silver.devops.gov.bc.ca\",\n \"REACT_APP_BCBOX_APP_URL\": \"https://bcbox-e38158-${ENV}.apps.silver.devops.gov.bc.ca\",\n \"REACT_APP_BCBOX_BUCKET_URL\": \"/api/v1/bucket\",\n \"REACT_APP_BCBOX_FIND_USER_ENDPOINT\": \"api/v1/user?email=\",\n \"REACT_APP_BCBOX_SET_USER_PERMISSION\": \"/api/v1/permission/bucket/\",\n \"REACT_APP_BCBOX_FILE_UPLOAD_ENDPOINT\": \"api/v1/object?bucketId=\",\n \"REACT_APP_COMS_ENDPOINT\": \"https://nrs.objectstore.gov.bc.ca\",\n \"REACT_APP_COMS_BUCKET\": \"${REACT_APP_COMS_BUCKET}\",\n \"REACT_APP_COMS_ACCESS_KEY_ID\": \"${REACT_APP_COMS_ACCESS_KEY_ID}\",\n \"REACT_APP_COMS_ACCESS_KEY\": \"${REACT_APP_COMS_ACCESS_KEY}\",\n \"REACT_APP_COMS_ACCESS_REGION\": \"ca-central-1\" \n }"
55+
config.js: "// runtime-config.js vars
56+
57+
\ window[\"_env_\"] = {
58+
59+
\ \"REACT_APP_NODE_ENV\": \"production\",
60+
61+
\ \"REACT_APP_AUTH_AUTHORITY\": \"https://epd-keycloak-${ENV}.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/\",
62+
63+
\ \"REACT_APP_AUTH_CLIENT_ID\": \"${REACT_APP_AUTH_CLIENT_ID}\",
64+
65+
\ \"REACT_APP_AUTH_REDIRECT_URI\": \"https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca/dashboard\", \
66+
67+
\ \"REACT_APP_AUTH_LOGOUT_REDIRECT_URI\": \"https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://epd-keycloak-${ENV}.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/protocol/openid-connect/logout?post_logout_redirect_uri=https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca\",
68+
69+
\ \"REACT_APP_AUTH_RESPONSE_TYPE\": \"code\",
70+
71+
\ \"REACT_APP_AUTH_SCOPE\": \"openid profile\",
72+
73+
\ \"REACT_APP_BACKEND_API\": \"https://epd-backend-gateway-${ENV}.apps.silver.devops.gov.bc.ca\", \
74+
75+
\ \"REACT_APP_AUTH_FILTER_PROTOCOL_CLAIMS\": \"true\",
76+
77+
\ \"REACT_APP_AUTH_LOAD_USER_INFO\": \"true\", \
78+
79+
\ \"REACT_APP_AUTH_REVOKE_TOKENS_ON_SIGNOUT\": \"true\",
80+
81+
\ \"REACT_APP_FORMSFLOW_WEB_URL\": \"https://forms-flow-web-root-config-${ENV}.apps.silver.devops.gov.bc.ca/\",
82+
83+
\ \"REACT_APP_CUSTOM_MAP_URL\": \"https://epd-frontend-${ENV}.apps.silver.devops.gov.bc.ca/map\",
84+
85+
\ \"REACT_APP_BACKEND_USERS_API\": \"https://epd-backend-users-${ENV}.apps.silver.devops.gov.bc.ca/\",
86+
87+
\ \"REACT_APP_BCBOX_BASE_URL\": \"https://common-object-management-service-coms-custom-e38158-${ENV}.apps.silver.devops.gov.bc.ca\",
88+
89+
\ \"REACT_APP_BCBOX_APP_URL\": \"https://bcbox-e38158-${ENV}.apps.silver.devops.gov.bc.ca\",
90+
91+
\ \"REACT_APP_BCBOX_BUCKET_URL\": \"/api/v1/bucket\",
92+
93+
\ \"REACT_APP_BCBOX_FIND_USER_ENDPOINT\": \"api/v1/user?email=\",
94+
95+
\ \"REACT_APP_BCBOX_SET_USER_PERMISSION\": \"/api/v1/permission/bucket/\",
96+
97+
\ \"REACT_APP_BCBOX_FILE_UPLOAD_ENDPOINT\": \"api/v1/object?bucketId=\",
98+
99+
\ \"REACT_APP_COMS_ENDPOINT\": \"https://nrs.objectstore.gov.bc.ca\",
100+
101+
\ \"REACT_APP_COMS_BUCKET\": \"${REACT_APP_COMS_BUCKET}\",
102+
103+
\ \"REACT_APP_COMS_ACCESS_KEY_ID\": \"${REACT_APP_COMS_ACCESS_KEY_ID}\",
104+
105+
\ \"REACT_APP_COMS_ACCESS_KEY\": \"${REACT_APP_COMS_ACCESS_KEY}\",
106+
107+
\ \"REACT_APP_COMS_ACCESS_REGION\": \"ca-central-1\"\
108+
109+
\ }"
61110
- apiVersion: v1
62111
kind: ImageStream
63112
metadata:
@@ -74,36 +123,26 @@ objects:
74123
name: ${REGISTRY}/${PROMOTE}:${IMAGE_TAG}
75124
referencePolicy:
76125
type: Local
77-
- apiVersion: v1
78-
kind: DeploymentConfig
126+
- apiVersion: apps/v1
127+
kind: Deployment
79128
metadata:
80129
labels:
81130
app: ${NAME}-${COMPONENT}
82131
name: ${NAME}-${COMPONENT}
83132
spec:
84133
replicas: 1
85-
triggers:
86-
- type: ConfigChange
87-
- type: ImageChange
88-
imageChangeParams:
89-
automatic: true
90-
containerNames:
91-
- ${NAME}-${COMPONENT}
92-
from:
93-
kind: ImageStreamTag
94-
name: ${NAME}-${COMPONENT}:${IMAGE_TAG}
95134
selector:
96-
deploymentconfig: ${NAME}-${COMPONENT}
135+
matchLabels:
136+
app: ${NAME}-${COMPONENT}
97137
strategy:
98-
type: Rolling
138+
type: RollingUpdate
99139
template:
100140
metadata:
101141
labels:
102142
app: ${NAME}-${COMPONENT}
103-
deploymentconfig: ${NAME}-${COMPONENT}
104143
spec:
105144
containers:
106-
- image: " "
145+
- image: "ghcr.io/${PROMOTE}:${IMAGE_TAG}"
107146
imagePullPolicy: Always
108147
name: ${NAME}-${COMPONENT}
109148
env:
@@ -153,10 +192,8 @@ objects:
153192
initialDelaySeconds: 60
154193
periodSeconds: 30
155194
timeoutSeconds: 5
156-
#Added for configMap mount
157195
volumeMounts:
158196
- name: ${NAME}-config
159-
#readOnly: true
160197
mountPath: /usr/share/nginx/html/config/
161198
volumes:
162199
- name: ${NAME}-config
@@ -175,7 +212,8 @@ objects:
175212
port: 80
176213
targetPort: ${{CONTAINER_PORT}}
177214
selector:
178-
deploymentconfig: ${NAME}-${COMPONENT}
215+
matchLabels:
216+
app: ${NAME}-${COMPONENT}
179217
- apiVersion: route.openshift.io/v1
180218
kind: Route
181219
metadata:
@@ -200,7 +238,7 @@ objects:
200238
spec:
201239
scaleTargetRef:
202240
apiVersion: apps.openshift.io/v1
203-
kind: DeploymentConfig
241+
kind: Deployment
204242
name: "${NAME}-${COMPONENT}"
205243
minReplicas: ${{MIN_REPLICAS}}
206244
maxReplicas: ${{MAX_REPLICAS}}

‎.github/workflows/ci-cd-openshift-dev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- 'dev'
8-
- 'feat/srs-758-newupdate' #test11
8+
- 'feat/srs-758-newupdate' #test
99

1010
paths:
1111
- 'backend/**'

0 commit comments

Comments
 (0)