@@ -89,10 +89,6 @@ define HOST
89
89
"$(HOST_PREFIX ) aest-sims.$(DOMAIN ) "
90
90
endef
91
91
92
- define DB_SERVICE_NAME
93
- "patroni-master"
94
- endef
95
-
96
92
define FORMS_NAME
97
93
"$(HOST_PREFIX ) forms"
98
94
endef
@@ -332,15 +328,13 @@ create-new-db:
332
328
run-db-migrations :
333
329
test -n " $( NAMESPACE) "
334
330
test -n " $( BUILD_NAMESPACE) "
335
- test -n " $( DB_SERVICE_NAME) "
336
331
test -n " $( API_SECRET_NAME) "
337
332
test -n " $( DB_MIGRATIONS_BUILD_REF) "
338
333
test -n " $( BUILD_REF) "
339
334
test -n " $( DB_MIGRATIONS) "
340
335
@echo " +\n++ Deploying DB_MIGRATIONS with tag: $( BUILD_REF) \n+"
341
336
@oc -n $(NAMESPACE ) process -f openshift/db-migrations-job.yml \
342
337
-p NAME=$(DB_MIGRATIONS ) \
343
- -p DB_SERVICE=$(DB_SERVICE_NAME ) \
344
338
-p BUILD_NAMESPACE=$(BUILD_NAMESPACE ) \
345
339
-p API_SECRET_NAME=$(API_SECRET_NAME ) \
346
340
-p IMAGE_STREAM_TAG=" $( DB_MIGRATIONS_BUILD_REF) :$( BUILD_REF) " \
@@ -384,7 +378,6 @@ deploy-api:
384
378
-p API_SECRET_NAME=$(API_SECRET_NAME ) \
385
379
-p HOST_NAME=$(HOST ) \
386
380
-p PORT=$(API_PORT ) \
387
- -p DB_SERVICE=$(DB_SERVICE_NAME ) \
388
381
-p BUILD_NAMESPACE=$(BUILD_NAMESPACE ) \
389
382
-p IMAGE_STREAM_TAG=" $( API_BUILD_REF) :$( BUILD_REF) " \
390
383
-p KEYCLOAK_REALM=$(KEYCLOAK_REALM ) \
@@ -409,7 +402,6 @@ deploy-workers:
409
402
test -n " $( BUILD_NAMESPACE) "
410
403
test -n " $( BUILD_REF) "
411
404
test -n " $( WORKERS_BUILD_REF) "
412
- test -n " $( DB_SERVICE_NAME) "
413
405
test -n " $( WORKERS_SECRET_NAME) "
414
406
test -n " $( WORKERS) "
415
407
test -n " $( WORKERS_PORT) "
@@ -419,7 +411,6 @@ deploy-workers:
419
411
-p NAME=$(WORKERS ) \
420
412
-p WORKERS_SECRET_NAME=$(WORKERS_SECRET_NAME ) \
421
413
-p BUILD_NAMESPACE=$(BUILD_NAMESPACE ) \
422
- -p DB_SERVICE=$(DB_SERVICE_NAME ) \
423
414
-p PORT=$(WORKERS_PORT ) \
424
415
-p IMAGE_STREAM_TAG=" $( WORKERS_BUILD_REF) :$( BUILD_REF) " \
425
416
-p BUILD_TAG=$(BUILD_REF ) \
@@ -432,7 +423,6 @@ deploy-queue-consumers:
432
423
test -n " $( BUILD_NAMESPACE) "
433
424
test -n " $( BUILD_REF) "
434
425
test -n " $( QUEUE_CONSUMERS_BUILD_REF) "
435
- test -n " $( DB_SERVICE_NAME) "
436
426
test -n " $( QUEUE_CONSUMERS_SECRET_NAME) "
437
427
test -n " $( QUEUE_CONSUMERS) "
438
428
test -n " $( QUEUE_CONSUMERS_PORT) "
@@ -445,7 +435,6 @@ deploy-queue-consumers:
445
435
-p NAME=$(QUEUE_CONSUMERS ) \
446
436
-p QUEUE_CONSUMERS_SECRET_NAME=$(QUEUE_CONSUMERS_SECRET_NAME ) \
447
437
-p BUILD_NAMESPACE=$(BUILD_NAMESPACE ) \
448
- -p DB_SERVICE=$(DB_SERVICE_NAME ) \
449
438
-p IMAGE_STREAM_TAG=" $( QUEUE_CONSUMERS_BUILD_REF) :$( BUILD_REF) " \
450
439
-p BUILD_TAG=$(BUILD_REF ) \
451
440
-p PORT=$(QUEUE_CONSUMERS_PORT ) \
@@ -464,7 +453,6 @@ deploy-load-test-gateway:
464
453
test -n " $( BUILD_NAMESPACE) "
465
454
test -n " $( BUILD_REF) "
466
455
test -n " $( LOAD_TEST_GATEWAY_BUILD_REF) "
467
- test -n " $( DB_SERVICE_NAME) "
468
456
test -n " $( LOAD_TEST_GATEWAY_SECRET_NAME) "
469
457
test -n " $( LOAD_TEST_GATEWAY) "
470
458
test -n " $( LOAD_TEST_GATEWAY_PORT) "
@@ -475,7 +463,6 @@ deploy-load-test-gateway:
475
463
-p NAME=$(LOAD_TEST_GATEWAY ) \
476
464
-p LOAD_TEST_GATEWAY_SECRET_NAME=$(LOAD_TEST_GATEWAY_SECRET_NAME ) \
477
465
-p BUILD_NAMESPACE=$(BUILD_NAMESPACE ) \
478
- -p DB_SERVICE=$(DB_SERVICE_NAME ) \
479
466
-p IMAGE_STREAM_TAG=" $( LOAD_TEST_GATEWAY_BUILD_REF) :$( BUILD_REF) " \
480
467
-p BUILD_TAG=$(BUILD_REF ) \
481
468
-p PORT=$(LOAD_TEST_GATEWAY_PORT ) \
0 commit comments