From 3f120b3491ca388b7ffeef67a6b23b15159d6de4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Boll <jboll@redhat.com>
Date: Tue, 7 Jan 2025 16:46:05 +0100
Subject: [PATCH] Fix makefile %.deploy overlap (#1047)

All deploytargets where changed to run using templatize by accident.
---
 .github/workflows/services-cd.yml | 6 +++---
 Makefile                          | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/services-cd.yml b/.github/workflows/services-cd.yml
index a3adb7756..5db9d1edf 100644
--- a/.github/workflows/services-cd.yml
+++ b/.github/workflows/services-cd.yml
@@ -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: |
diff --git a/Makefile b/Makefile
index fb8678596..f40e096a1 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -125,7 +125,7 @@ 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
 
@@ -133,9 +133,7 @@ services_svc_pipelines = backend frontend cluster-service
 	$(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