makefile modified

Azure · Jun 10, 2024 · d2034f0 · d2034f0
1 parent de81ff3
commit d2034f0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -76,8 +76,8 @@ runlocal-rp:
 		podman system connection list; \
 		echo "Using ARO_IMAGE: $(ARO_IMAGE)"; \
 		if [ -z "$(ARO_IMAGE)" ]; then echo "Error: ARO_IMAGE is not set"; exit 1; fi; \
-		podman run --rm -d -p 8443:8443 --name aro-rp -e DOMAIN_NAME=$(DOMAIN_NAME) -e AZURE_FP_CLIENT_ID=$(AZURE_FP_CLIENT_ID) $(ARO_IMAGE) rp; \
-	
+		podman run --rm -d -p 8443:8443 --name aro-rp -e DOMAIN_NAME=$(DOMAIN_NAME) -e AZURE_FP_CLIENT_ID=$(AZURE_FP_CLIENT_ID) $(ARO_IMAGE) rp
+
 ensure-aro-image:
 	@if ! podman image exists $(ARO_IMAGE); then \
 		$(MAKE) build-local-rp-image; \
@@ -105,8 +105,12 @@ delete-cluster:
 	CGO_ENABLED=0 go run ./hack/cluster/cluster.go delete
 
 e2e: ensure-aro-image
-	@podman run --rm -d --name aro-e2e $(ARO_IMAGE) e2e
-	@podman logs aro-e2e
+	@podman run --rm --name aro-e2e --network host \
+		-e AZURE_TENANT_ID=$(AZURE_TENANT_ID) \
+		-e AZURE_SUBSCRIPTION_ID=$(AZURE_SUBSCRIPTION_ID) \
+		-e AZURE_CLIENT_ID=$(AZURE_CLIENT_ID) \
+		-e AZURE_CLIENT_SECRET=$(AZURE_CLIENT_SECRET) \
+		aro:e2e
 
 az: pyenv
 	. pyenv/bin/activate && \

diff --git a/setup_resources.sh b/setup_resources.sh
@@ -5,38 +5,14 @@ set -a
 source .env
 set +a
 
-# Check if az CLI is installed
-if ! command -v az &> /dev/null
-then
-    echo "az CLI could not be found. Please install it to proceed."
-    exit 1
-fi
-
-# Validate az CLI connectivity
-if ! az account show &> /dev/null
-then
-    echo "az CLI is not connected. Please login using 'az login' and try again."
-    exit 1
-fi
-
-# Get the key name and key version from the arguments
-KEY_NAME=${1}
-KEY_VERSION=${2}
-
-# Ensure KEY_NAME and KEY_VERSION are provided
-if [ -z "$KEY_NAME" ] || [ -z "$KEY_VERSION" ]; then
-    echo "Usage: $0 <KEY_NAME> <KEY_VERSION>"
-    exit 1
-fi
-
 # Set cluster-specific environment variables
-RESOURCEGROUP=${RESOURCEGROUP:-"v4-westeurope"}
+RESOURCEGROUP="v4-westeurope"
 DATABASE_ACCOUNT_NAME="${USER}-aro-${LOCATION}"
 KEYVAULT_PREFIX="${USER}-aro-${LOCATION}"
 
 # Create resource group
 echo "Ensuring resource group $RESOURCEGROUP in $LOCATION..."
-az group show --name "$RESOURCEGROUP" &> /dev/null
+az group show --name "$RESOURCEGROUP" &>/dev/null
 if [ $? -ne 0 ]; then
   az group create --name "$RESOURCEGROUP" --location "$LOCATION"
 else
@@ -45,7 +21,7 @@ fi
 
 # Create virtual network
 echo "Ensuring virtual network dev-vnet in resource group $RESOURCEGROUP..."
-az network vnet show --resource-group "$RESOURCEGROUP" --name dev-vnet &> /dev/null
+az network vnet show --resource-group "$RESOURCEGROUP" --name dev-vnet &>/dev/null
 if [ $? -ne 0 ]; then
   az network vnet create --resource-group "$RESOURCEGROUP" --name dev-vnet --address-prefix 10.0.0.0/16 --subnet-name dev-subnet --subnet-prefix 10.0.0.0/24
 else
@@ -54,17 +30,17 @@ fi
 
 # Create key vault
 echo "Ensuring key vault ${KEYVAULT_PREFIX}-kv in resource group $RESOURCEGROUP..."
-az keyvault show --name "${KEYVAULT_PREFIX}-kv" --resource-group "$RESOURCEGROUP" &> /dev/null
+az keyvault show --name "${KEYVAULT_PREFIX}-kv" --resource-group "$RESOURCEGROUP" &>/dev/null
 if [ $? -ne 0 ]; then
   az keyvault create --name "${KEYVAULT_PREFIX}-kv" --resource-group "$RESOURCEGROUP" --location "$LOCATION"
 else
   echo "Key vault ${KEYVAULT_PREFIX}-kv already exists."
 fi
 
 # Create disk encryption set
-KEY_URL="https://${KEYVAULT_PREFIX}-kv.vault.azure.net/keys/${KEY_NAME}/${KEY_VERSION}"
+KEY_URL="https://${KEYVAULT_PREFIX}-kv.vault.azure.net/keys/<key-name>/<key-version>" # Replace with the actual key URL
 echo "Ensuring disk encryption set ${RESOURCEGROUP}-disk-encryption-set in resource group $RESOURCEGROUP..."
-az disk-encryption-set show --name "${RESOURCEGROUP}-disk-encryption-set" --resource-group "$RESOURCEGROUP" &> /dev/null
+az disk-encryption-set show --name "${RESOURCEGROUP}-disk-encryption-set" --resource-group "$RESOURCEGROUP" &>/dev/null
 if [ $? -ne 0 ]; then
   az disk-encryption-set create --name "${RESOURCEGROUP}-disk-encryption-set" --resource-group "$RESOURCEGROUP" --location "$LOCATION" --source-vault "/subscriptions/$AZURE_SUBSCRIPTION_ID/resourceGroups/$RESOURCEGROUP/providers/Microsoft.KeyVault/vaults/${KEYVAULT_PREFIX}-kv" --key-url "$KEY_URL"
 else