Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make vnet name configurable #19

Merged
merged 1 commit into from
Aug 26, 2024
+5 −5
Merged

make vnet name configurable #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bicep.makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion bicep/network.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
6 changes: 3 additions & 3 deletions hack/domain-records.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# SPDX-License-Identifier: Apache-2.0

DOMAIN=""
ARO_NAME=""
ARO_CLUSTER_NAME=""
ARO_RESOURCE_GROUP=""

print_help() {
Expand All @@ -28,7 +28,7 @@ while (( "$#" )); do
shift 2
;;
--aro-name)
ARO_NAME="$2"
ARO_CLUSTER_NAME="$2"
shift 2
;;
--aro-resource-group)
Expand All @@ -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
Expand Down