Skip to content

Commit c9adb4e

Browse files
dheepak-aotdheepak-aot
authored
#3685 - Convert to Deployment - Part 2 (#4231)
# Convert the following DC to Deployments - [x] Queue Consumers - [x] Workers - [x] API - [x] Load Test Gateway
1 parent 2380a68 commit c9adb4e

File tree

5 files changed

+48
-36
lines changed

5 files changed

+48
-36
lines changed

‎devops/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ deploy-api:
371371
-p TLS_CA_CERTIFICATE=$(TLS_CA_CERTIFICATE) \
372372
-p ALLOW_BETA_USERS_ONLY=$(ALLOW_BETA_USERS_ONLY) \
373373
| oc -n $(NAMESPACE) apply -f -
374-
$(call rollout_and_wait,dc/$(API))
374+
$(call rollout_and_wait,deployment/$(API))
375375

376376
deploy-workers:
377377
test -n "$(NAMESPACE)"
@@ -393,7 +393,7 @@ deploy-workers:
393393
-p BYPASS_CRA_INCOME_VERIFICATION=$(BYPASS_CRA_INCOME_VERIFICATION) \
394394
-p DISABLE_ORM_CACHE=$(DISABLE_ORM_CACHE) \
395395
| oc -n $(NAMESPACE) apply -f -
396-
$(call rollout_and_wait,dc/$(WORKERS))
396+
$(call rollout_and_wait,deployment/$(WORKERS))
397397

398398
deploy-queue-consumers:
399399
test -n "$(NAMESPACE)"
@@ -426,7 +426,7 @@ deploy-queue-consumers:
426426
-p TLS_KEY=$(TLS_KEY) \
427427
-p TLS_CA_CERTIFICATE=$(TLS_CA_CERTIFICATE) \
428428
| oc -n $(NAMESPACE) apply -f -
429-
$(call rollout_and_wait,dc/$(QUEUE_CONSUMERS))
429+
$(call rollout_and_wait,deployment/$(QUEUE_CONSUMERS))
430430

431431
deploy-load-test-gateway:
432432
test -n "$(NAMESPACE)"
@@ -453,7 +453,7 @@ deploy-load-test-gateway:
453453
-p TLS_KEY=$(TLS_KEY) \
454454
-p TLS_CA_CERTIFICATE=$(TLS_CA_CERTIFICATE) \
455455
| oc -n $(NAMESPACE) apply -f -
456-
$(call rollout_and_wait,dc/$(LOAD_TEST_GATEWAY))
456+
$(call rollout_and_wait,deployment/$(LOAD_TEST_GATEWAY))
457457

458458
deploy-web:
459459
test -n "$(NAMESPACE)"

‎devops/openshift/api-deploy.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,24 @@ labels:
66
project: ${PROJECT}
77
service: ${SERVICE_NAME}
88
objects:
9-
- apiVersion: apps.openshift.io/v1
10-
kind: DeploymentConfig
9+
- apiVersion: apps/v1
10+
kind: Deployment
1111
metadata:
12+
labels:
13+
app: ${NAME}
1214
name: ${NAME}
1315
spec:
1416
replicas: "${{REPLICAS}}"
1517
revisionHistoryLimit: 10
1618
selector:
17-
deploymentconfig: ${NAME}
19+
matchLabels:
20+
app: ${NAME}
1821
strategy:
19-
type: Rolling
22+
type: RollingUpdate
2023
template:
2124
metadata:
2225
labels:
23-
deploymentconfig: ${NAME}
26+
app: ${NAME}
2427
spec:
2528
containers:
2629
- env:
@@ -239,7 +242,7 @@ objects:
239242
port: 80
240243
targetPort: ${{PORT}}
241244
selector:
242-
deploymentconfig: ${NAME}
245+
app: ${NAME}
243246
type: ClusterIP
244247
- apiVersion: route.openshift.io/v1
245248
kind: Route
@@ -341,8 +344,8 @@ objects:
341344
name: ${NAME}-hpa
342345
spec:
343346
scaleTargetRef:
344-
apiVersion: apps.openshift.io/v1
345-
kind: DeploymentConfig
347+
apiVersion: apps/v1
348+
kind: Deployment
346349
name: ${NAME}
347350
minReplicas: "${{REPLICAS}}"
348351
maxReplicas: 10
@@ -366,7 +369,7 @@ objects:
366369
spec:
367370
selector:
368371
matchLabels:
369-
deploymentconfig: ${NAME}
372+
app: ${NAME}
370373
maxUnavailable: 1
371374
parameters:
372375
- name: NAME

‎devops/openshift/load-test-gateway-deploy.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,24 @@ labels:
66
project: ${PROJECT}
77
service: ${SERVICE_NAME}
88
objects:
9-
- apiVersion: apps.openshift.io/v1
10-
kind: DeploymentConfig
9+
- apiVersion: apps/v1
10+
kind: Deployment
1111
metadata:
12+
labels:
13+
app: ${NAME}
1214
name: ${NAME}
1315
spec:
1416
replicas: "${{REPLICAS}}"
1517
revisionHistoryLimit: 10
1618
selector:
17-
deploymentconfig: ${NAME}
19+
matchLabels:
20+
app: ${NAME}
1821
strategy:
19-
type: Rolling
22+
type: RollingUpdate
2023
template:
2124
metadata:
2225
labels:
23-
deploymentconfig: ${NAME}
26+
app: ${NAME}
2427
spec:
2528
containers:
2629
- env:
@@ -98,7 +101,7 @@ objects:
98101
port: 80
99102
targetPort: ${{PORT}}
100103
selector:
101-
deploymentconfig: ${NAME}
104+
app: ${NAME}
102105
type: ClusterIP
103106
- apiVersion: route.openshift.io/v1
104107
kind: Route

‎devops/openshift/queue-consumers-deploy.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,28 @@ labels:
66
project: ${PROJECT}
77
service: ${SERVICE_NAME}
88
objects:
9-
- apiVersion: apps.openshift.io/v1
10-
kind: DeploymentConfig
9+
- apiVersion: apps/v1
10+
kind: Deployment
1111
metadata:
12+
labels:
13+
app: ${NAME}
1214
name: ${NAME}
1315
spec:
1416
replicas: "${{REPLICAS}}"
1517
revisionHistoryLimit: 10
1618
selector:
17-
deploymentconfig: ${NAME}
19+
matchLabels:
20+
app: ${NAME}
1821
strategy:
19-
type: Rolling
22+
type: RollingUpdate
2023
template:
2124
metadata:
2225
annotations:
2326
prometheus.io/scrape: "true"
2427
prometheus.io/port: ${PORT}
2528
prometheus.io/path: /metrics
2629
labels:
27-
deploymentconfig: ${NAME}
30+
app: ${NAME}
2831
spec:
2932
containers:
3033
- env:
@@ -293,7 +296,7 @@ objects:
293296
port: 80
294297
targetPort: ${{PORT}}
295298
selector:
296-
deploymentconfig: ${NAME}
299+
app: ${NAME}
297300
type: ClusterIP
298301
- apiVersion: route.openshift.io/v1
299302
kind: Route
@@ -331,8 +334,8 @@ objects:
331334
name: ${NAME}-hpa
332335
spec:
333336
scaleTargetRef:
334-
apiVersion: apps.openshift.io/v1
335-
kind: DeploymentConfig
337+
apiVersion: apps/v1
338+
kind: Deployment
336339
name: ${NAME}
337340
minReplicas: "${{REPLICAS}}"
338341
maxReplicas: 10
@@ -356,7 +359,7 @@ objects:
356359
spec:
357360
selector:
358361
matchLabels:
359-
deploymentconfig: ${NAME}
362+
app: ${NAME}
360363
maxUnavailable: 1
361364
parameters:
362365
- name: NAME

‎devops/openshift/workers-deploy.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,24 @@ labels:
66
project: ${PROJECT}
77
service: ${SERVICE_NAME}
88
objects:
9-
- apiVersion: apps.openshift.io/v1
10-
kind: DeploymentConfig
9+
- apiVersion: apps/v1
10+
kind: Deployment
1111
metadata:
12+
labels:
13+
app: ${NAME}
1214
name: ${NAME}
1315
spec:
1416
replicas: "${{REPLICAS}}"
1517
revisionHistoryLimit: 10
1618
selector:
17-
deploymentconfig: ${NAME}
19+
matchLabels:
20+
app: ${NAME}
1821
strategy:
19-
type: Rolling
22+
type: RollingUpdate
2023
template:
2124
metadata:
2225
labels:
23-
deploymentconfig: ${NAME}
26+
app: ${NAME}
2427
spec:
2528
containers:
2629
- env:
@@ -112,8 +115,8 @@ objects:
112115
name: ${NAME}-hpa
113116
spec:
114117
scaleTargetRef:
115-
apiVersion: apps.openshift.io/v1
116-
kind: DeploymentConfig
118+
apiVersion: apps/v1
119+
kind: Deployment
117120
name: ${NAME}
118121
minReplicas: "${{REPLICAS}}"
119122
maxReplicas: 10
@@ -137,7 +140,7 @@ objects:
137140
spec:
138141
selector:
139142
matchLabels:
140-
deploymentconfig: ${NAME}
143+
app: ${NAME}
141144
maxUnavailable: 1
142145
parameters:
143146
- name: NAME

0 commit comments

Comments
 (0)