From fef9236299d76ce038484975ce7e84468b95e3ac Mon Sep 17 00:00:00 2001 From: cloudmelon Date: Thu, 20 Aug 2020 00:15:36 +0100 Subject: [PATCH] adjustment --- .../deployment/private-aks/scripts/deploy-bdc.sh | 8 +++----- .../private-aks/scripts/deploy-private-aks-udr.sh | 7 +------ .../deployment/private-aks/scripts/deploy-private-aks.sh | 3 +-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-bdc.sh b/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-bdc.sh index 4f56ddb7..043bc80f 100644 --- a/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-bdc.sh +++ b/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-bdc.sh @@ -1,7 +1,7 @@ #!/bin/bash #Get password as input. It is used as default for controller, SQL Server Master instance (sa account) and Knox. - +# while true; do read -s -p "Create Admin username for Big Data Cluster: " bdcadmin echo @@ -30,16 +30,14 @@ azdata bdc config replace -c private-bdc-aks /bdc.json -j "$.spec.resources.gate azdata bdc config replace -c private-bdc-aks /bdc.json -j "$.spec.resources.appproxy.spec.endpoints[0].serviceType=NodePort" #In case you're deploying BDC in HA mode ( aks-dev-test-ha profile ) please also use the following command -#azdata bdc config replace -c private-bdc-aks /bdc.json -j "$.spec.resources.master.spec.endpoints[1].serviceType= NodePort" - - +#azdata bdc config replace -c private-bdc-aks /bdc.json -j "$.spec.resources.master.spec.endpoints[1].serviceType=NodePort" export AZDATA_USERNAME=$bdcadmin export AZDATA_PASSWORD=$password azdata bdc create --config-profile private-bdc-aks --accept-eula yes #Login and get endpoint list for the cluster. - +# azdata login -n mssql-cluster azdata bdc endpoint list --output table diff --git a/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks-udr.sh b/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks-udr.sh index 11302b4e..c2a3addd 100644 --- a/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks-udr.sh +++ b/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks-udr.sh @@ -1,7 +1,6 @@ #!/bin/bash - #Get Subscription ID and service principles as input. It is used as default for controller, SQL Server Master instance (sa account) and Knox. - +# while true; do read -s -p "Your Azure Subscription: " subscription echo @@ -16,7 +15,6 @@ while true; do done #Define a set of environment variables to be used in resource creations. - export SUBID=$subscription export REGION_NAME=$region @@ -89,13 +87,11 @@ az network route-table route create -g $RESOURCE_GROUP --name $FWROUTE_NAME_INTE #Add FW Network Rules - az network firewall network-rule create -g $RESOURCE_GROUP -f $FWNAME --collection-name 'aksfwnr' -n 'apiudp' --protocols 'UDP' --source-addresses '*' --destination-addresses "AzureCloud.$REGION_NAME" --destination-ports 1194 --action allow --priority 100 az network firewall network-rule create -g $RESOURCE_GROUP -f $FWNAME --collection-name 'aksfwnr' -n 'apitcp' --protocols 'TCP' --source-addresses '*' --destination-addresses "AzureCloud.$REGION_NAME" --destination-ports 9000 az network firewall network-rule create -g $RESOURCE_GROUP -f $FWNAME --collection-name 'aksfwnr' -n 'time' --protocols 'UDP' --source-addresses '*' --destination-fqdns 'ntp.ubuntu.com' --destination-ports 123 #Add FW Application Rules - az network firewall application-rule create -g $RESOURCE_GROUP -f $FWNAME --collection-name 'aksfwar' -n 'fqdn' --source-addresses '*' --protocols 'http=80' 'https=443' --fqdn-tags "AzureKubernetesService" --action allow --priority 100 #Associate User defined route table (UDR) to AKS cluster where deployed BDC previsouly @@ -106,7 +102,6 @@ az network vnet subnet update -g $RESOURCE_GROUP --vnet-name $VNET_NAME --name $ #Create SP and Assign Permission to Virtual Network - az ad sp create-for-rbac -n "bdcaks-sp" --skip-assignment export APPID=$sp_id diff --git a/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks.sh b/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks.sh index bebb0038..17846c9b 100644 --- a/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks.sh +++ b/samples/features/sql-big-data-cluster/deployment/private-aks/scripts/deploy-private-aks.sh @@ -1,7 +1,6 @@ #!/bin/bash - #Define a set of environment variables to be used in resource creations. - +# export REGION_NAME=northeurope export RESOURCE_GROUP=private-bdc-aks-rg export SUBNET_NAME=aks-subnet