Skip to content

Commit

Permalink
Fix makefile %.deploy overlap (#1047)
Browse files Browse the repository at this point in the history
All deploytargets where changed to run using templatize by accident.
  • Loading branch information
janboll authored Jan 7, 2025
1 parent a8c77ec commit 3f120b3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/services-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@
- name: 'Deploy Frontend'
run: |
make frontend.deploy
make frontend.deploy_pipeline
- name: 'Deploy Backend'
run: |
make backend.deploy
make backend.deploy_pipeline
- name: 'Deploy Cluster Service'
run: |
make cluster-service.deploy
make cluster-service.deploy_pipeline
- name: 'Deploy Maestro'
run: |
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ infra.clean:
# separator "/" (used for maestro only).

# Services deployed on "svc" aks cluster
services_svc = istio metrics maestro.server maestro.registration
services_svc = istio metrics maestro.server maestro.registration
# Services deployed on "mgmt" aks cluster(s)
services_mgmt = acm maestro.agent pko hypershiftoperator
# List of all services
Expand All @@ -125,17 +125,15 @@ services_all = $(join services_svc,services_mgmt)
# This sections is used to reference pipeline runs and should replace
# the usage of `svc-deploh.sh` script in the future.
services_svc_pipelines = backend frontend cluster-service
%.deploy:
%.deploy_pipeline:
$(eval export dirname=$(subst .,/,$(basename $@)))
./templatize.sh $(DEPLOY_ENV) -p ./$(dirname)/pipeline.yaml -s deploy -P run -c public

%.dry_run:
$(eval export dirname=$(subst .,/,$(basename $@)))
./templatize.sh $(DEPLOY_ENV) -p ./$(dirname)/pipeline.yaml -s deploy -P run -c public -d

services_svc_all = $(join services_svc, services_svc_pipelines)

svc.deployall: $(addsuffix .deploy, $(services_svc_all))
svc.deployall: $(addsuffix .deploy, $(services_svc)) $(addsuffix .deploy_pipeline, $(services_svc_pipelines))
mgmt.deployall: $(addsuffix .deploy, $(services_mgmt))
deployall: svc.deployall mgmt.deployall

Expand Down

0 comments on commit 3f120b3

Please sign in to comment.