templatize only Makefile include not makefile itself

Signed-off-by: Gerd Oberlechner <[email protected]>

backend/.gitignore

@@ -1 +1 @@
-Makefile
+config.mk

backend/Makefile.tmpl.mk → backend/Makefile

@@ -1,14 +1,19 @@
 SHELL = /bin/bash
+DEPLOY_ENV ?= personal-dev
+
+$(shell ../templatize.sh $(DEPLOY_ENV) config.tmpl.mk config.mk)
+
+include config.mk
 
 COMMIT = $(shell git rev-parse --short=7 HEAD)
-ARO_HCP_BASE_IMAGE ?= {{ .acrName }}.azurecr.io
+ARO_HCP_BASE_IMAGE ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
 ARO_HCP_BACKEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpbackend:$(COMMIT)
 
 backend:
 	go build -o aro-hcp-backend .
 
 run:
-	./aro-hcp-backend --location {{ .region }} \
+	./aro-hcp-backend --location ${LOCATION} \
 		--clusters-service-url http://localhost:8000
 
 clean:
@@ -24,20 +29,20 @@ push: image
 
 deploy:
 	BACKEND_MI_CLIENT_ID=$(shell az identity show \
-			-g {{ .serviceClusterRG }} \
+			-g ${RESOURCEGROUP} \
 			-n backend \
 			--query clientId);\
-	ISTO_VERSION=$(shell az aks show -n {{ .aksName }} -g {{ .serviceClusterRG }} --query serviceMeshProfile.istio.revisions[-1] -o tsv) && \
+	ISTO_VERSION=$(shell az aks show -n ${AKS_NAME} -g ${RESOURCEGROUP} --query serviceMeshProfile.istio.revisions[-1] -o tsv) && \
 	kubectl create namespace aro-hcp --dry-run=client -o json | kubectl apply -f - && \
 	kubectl label namespace aro-hcp "istio.io/rev=$${ISTO_VERSION}" --overwrite=true && \
 	helm upgrade --install aro-hcp-backend-dev \
 		deploy/helm/backend/ \
-		--set configMap.databaseName={{ .frontendCosmosDBName }} \
-		--set configMap.databaseUrl="https://{{ .frontendCosmosDBName }}.documents.azure.com:443/" \
+		--set configMap.databaseName=${DB_NAME} \
+		--set configMap.databaseUrl="https://${DB_NAME}.documents.azure.com:443/" \
 		--set configMap.backendMiClientId="$${BACKEND_MI_CLIENT_ID}" \
 		--set serviceAccount.workloadIdentityClientId="$${BACKEND_MI_CLIENT_ID}" \
 		--set configMap.currentVersion=${ARO_HCP_BACKEND_IMAGE} \
-		--set configMap.location={{ .region }} \
+		--set configMap.location=${LOCATION} \
 		--set deployment.imageName=${ARO_HCP_BACKEND_IMAGE} \
 		--namespace aro-hcp
 

backend/config.tmpl.mk

@@ -0,0 +1,5 @@
+ARO_HCP_IMAGE_ACR ?= {{ .acrName }}
+LOCATION ?= {{ .region }}
+RESOURCEGROUP ?= {{ .serviceClusterRG }}
+AKS_NAME ?= {{ .aksName }}
+DB_NAME ?= {{ .frontendCosmosDBName }}

frontend/.gitignore

@@ -1 +1 @@
-Makefile
+config.mk

frontend/Makefile.tmpl.mk → frontend/Makefile

@@ -1,14 +1,19 @@
 SHELL = /bin/bash
+DEPLOY_ENV ?= personal-dev
+
+$(shell ../templatize.sh $(DEPLOY_ENV) config.tmpl.mk config.mk)
+
+include config.mk
 
 COMMIT = $(shell git rev-parse --short=7 HEAD)
-ARO_HCP_BASE_IMAGE ?= {{ .acrName }}.azurecr.io
+ARO_HCP_BASE_IMAGE ?=${ARO_HCP_IMAGE_ACR}.azurecr.io
 ARO_HCP_FRONTEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpfrontend:$(COMMIT)
 
 frontend:
 	go build -o aro-hcp-frontend .
 
 run:
-	./aro-hcp-frontend --use-cache --location {{ .region }} \
+	./aro-hcp-frontend --use-cache --location ${LOCATION} \
 		--clusters-service-url http://localhost:8000 \
 		--cluster-service-provision-shard 1 \
 		--cluster-service-noop-provision \
@@ -29,20 +34,20 @@ push: image
 
 deploy:
 	FRONTEND_MI_CLIENT_ID=$(shell az identity show \
-			-g {{ .serviceClusterRG }} \
+			-g ${RESOURCEGROUP} \
 			-n frontend \
 			--query clientId);\
-	ISTO_VERSION=$(shell az aks show -n {{ .aksName }} -g {{ .serviceClusterRG }} --query serviceMeshProfile.istio.revisions[-1] -o tsv) && \
+	ISTO_VERSION=$(shell az aks show -n ${AKS_NAME} -g ${RESOURCEGROUP} --query serviceMeshProfile.istio.revisions[-1] -o tsv) && \
 	kubectl create namespace aro-hcp --dry-run=client -o json | kubectl apply -f - && \
 	kubectl label namespace aro-hcp "istio.io/rev=$${ISTO_VERSION}" --overwrite=true && \
 	helm upgrade --install aro-hcp-frontend-dev \
 		deploy/helm/frontend/ \
-		--set configMap.databaseName={{ .frontendCosmosDBName }} \
-		--set configMap.databaseUrl="https://{{ .frontendCosmosDBName }}.documents.azure.com:443/" \
+		--set configMap.databaseName=${DB_NAME} \
+		--set configMap.databaseUrl="https://${DB_NAME}.documents.azure.com:443/" \
 		--set configMap.frontendMiClientId="$${FRONTEND_MI_CLIENT_ID}" \
 		--set serviceAccount.workloadIdentityClientId="$${FRONTEND_MI_CLIENT_ID}" \
 		--set configMap.currentVersion=${ARO_HCP_FRONTEND_IMAGE} \
-		--set configMap.location={{ .region }}  \
+		--set configMap.location=${LOCATION}  \
 		--set deployment.imageName=${ARO_HCP_FRONTEND_IMAGE} \
 		--namespace aro-hcp
 

frontend/README.md

@@ -2,14 +2,6 @@
 
 ## Prerequisite
 
-The `Makefile` is templated based on the ARO HCP environment to interact with.
-
-Run the following command to generate a `Makefile` for personal development.
-
-```bash
-./generate-makefile.sh personal-dev
-```
-
 ## Build frontend binary for local testing
 ```
 make frontend

frontend/config.tmpl.mk

@@ -0,0 +1,5 @@
+ARO_HCP_IMAGE_ACR ?= {{ .acrName }}
+LOCATION ?= {{ .region }}
+RESOURCEGROUP ?= {{ .serviceClusterRG }}
+AKS_NAME ?= {{ .aksName }}
+DB_NAME ?= {{ .frontendCosmosDBName }}