diff --git a/bicep.makefile b/bicep.makefile index dd6d8fd..1cee752 100644 --- a/bicep.makefile +++ b/bicep.makefile @@ -34,7 +34,7 @@ network-deploy: ## Deploy network az deployment group create --resource-group ${ARO_RESOURCE_GROUP} \ --template-file bicep/network.bicep -.PNONY: resource-group +.PHONY: resource-group resource-group: ## Create resource group az group create --name ${ARO_RESOURCE_GROUP} --location ${ARO_LOCATION} --query name -o tsv diff --git a/bicep/network.bicep b/bicep/network.bicep index defed53..f14ed29 100644 --- a/bicep/network.bicep +++ b/bicep/network.bicep @@ -4,7 +4,7 @@ // // SPDX-License-Identifier: Apache-2.0 -param vnetName string = 'aro-sapeic-vnet' +param vnetName string = '${resourceGroup().name}-vnet' param masterSubnetName string = 'master' param workerSubnetName string = 'worker' diff --git a/hack/domain-records.sh b/hack/domain-records.sh index f138dbe..8c7d8a8 100755 --- a/hack/domain-records.sh +++ b/hack/domain-records.sh @@ -7,7 +7,7 @@ # SPDX-License-Identifier: Apache-2.0 DOMAIN="" -ARO_NAME="" +ARO_CLUSTER_NAME="" ARO_RESOURCE_GROUP="" print_help() { @@ -28,7 +28,7 @@ while (( "$#" )); do shift 2 ;; --aro-name) - ARO_NAME="$2" + ARO_CLUSTER_NAME="$2" shift 2 ;; --aro-resource-group) @@ -41,7 +41,7 @@ while (( "$#" )); do esac done -if [ -z "$DOMAIN" ] || [ -z "$ARO_NAME" ] || [ -z "$ARO_RESOURCE_GROUP" ]; then +if [ -z "$DOMAIN" ] || [ -z "$ARO_CLUSTER_NAME" ] || [ -z "$ARO_RESOURCE_GROUP" ]; then echo "Error: Missing argument" print_help fi