cleanup

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

backend/.gitignore

@@ -1 +0,0 @@
-config.mk

config/config.yaml

@@ -149,7 +149,6 @@ clouds:
         etcd:
           kvSoftDelete: false
       mgmt:
-        subscription: ARO Hosted Control Planes (EA Subscription 1)
         # MGMTM AKS nodepools - big enough for 2 HCPs
         systemAgentPool:
           minCount: 1

dev-infrastructure/svc-pipeline.yaml

@@ -24,4 +24,4 @@ resourceGroups:
     - name: GRAFANA_NAME
       configRef: grafanaName
     dependsOn:
-    - region
+    - svc

frontend/.gitignore

@@ -1 +0,0 @@
-config.mk

frontend/Makefile

@@ -1,6 +1,6 @@
-SHELL = /bin/bash
+include ../setup-env.mk
 
-COMMIT = $(shell git rev-parse --short=7 HEAD)
+COMMIT ?= $(shell git rev-parse --short=7 HEAD)
 ARO_HCP_BASE_IMAGE ?= ${ARO_HCP_IMAGE_ACR}.azurecr.io
 ARO_HCP_FRONTEND_IMAGE ?= $(ARO_HCP_BASE_IMAGE)/arohcpfrontend:$(COMMIT)
 
@@ -16,13 +16,15 @@ run:
 
 clean:
 	rm -f aro-hcp-frontend
+.PHONY: clean
 
 build-push: image push
 
 image:
 	pushd .. && git archive --output frontend/archive.tar.gz HEAD && popd
 	docker build -f "./Dockerfile" -t ${ARO_HCP_FRONTEND_IMAGE} .
 	rm -f archive.tar.gz
+.PHONY: image
 
 push: image
 	az acr login --name ${ARO_HCP_IMAGE_ACR}
@@ -33,8 +35,8 @@ deploy:
 			-g ${RESOURCEGROUP} \
 			-n frontend \
 			--query clientId);\
-	ISTO_VERSION=$(shell az aks show -n ${AKS_NAME} -g ${RESOURCEGROUP} --query serviceMeshProfile.istio.revisions[-1] -o tsv) && \
-	DB_URL=$(shell az cosmosdb show -n ${DB_NAME} -g ${RESOURCEGROUP} --query documentEndpoint -o tsv) && \
+	ISTO_VERSION=$$(az aks show -n ${AKS_NAME} -g ${RESOURCEGROUP} --query serviceMeshProfile.istio.revisions[-1] -o tsv) && \
+	DB_URL=$$(az cosmosdb show -n ${DB_NAME} -g ${RESOURCEGROUP} --query documentEndpoint -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 \
@@ -47,11 +49,11 @@ deploy:
 		--set configMap.location=${LOCATION}  \
 		--set deployment.imageName=${ARO_HCP_FRONTEND_IMAGE} \
 		--namespace aro-hcp
+.PHONY: deploy
 
 undeploy:
 	helm uninstall aro-hcp-frontend-dev --namespace aro-hcp
+.PHONY: undeploy
 
 smoke-tests:
 	go test -v -count 1 ./utils/frontend_smoke_test.go
-
-.PHONY: frontend clean image deploy undeploy

frontend/pipeline.yaml

@@ -1,8 +1,8 @@
 serviceGroup: Microsoft.Azure.ARO.Test
 rolloutName: RP - Frontend
 resourceGroups:
-- name: {{ .serviceClusterRG }}
-  subscription: {{ .serviceClusterSubscription }}
+- name: {{ .svc.rg }}
+  subscription: {{ .svc.subscription }}
   aksCluster: {{ .aksName }}
   steps:
   - name: deploy
@@ -14,8 +14,8 @@ resourceGroups:
     - name: LOCATION
       configRef: region
     - name: RESOURCEGROUP
-      configRef: serviceClusterRG
+      configRef: svc.rg
     - name: AKS_NAME
       configRef: aksName
     - name: DB_NAME
-      configRef: frontendCosmosDBName
+      configRef: frontend.cosmosDB.name