From d30fd67dd36944fe332a009e4fcf87d001cc4aeb Mon Sep 17 00:00:00 2001 From: Ben Weissman Date: Thu, 25 Jul 2019 11:04:08 +0200 Subject: [PATCH 1/6] Update deploy-sql-big-data-aks.py multiple fixes --- .../deployment/aks/deploy-sql-big-data-aks.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py index e333794dbf..b37d47fe63 100644 --- a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py +++ b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py @@ -24,8 +24,9 @@ def executeCmd (cmd): # SUBSCRIPTION_ID = input("Provide your Azure subscription ID:").strip() GROUP_NAME = input("Provide Azure resource group name to be created:").strip() -DOCKER_USERNAME = input("Provide your Docker username:").strip() -DOCKER_PASSWORD = getpass.getpass("Provide your Docker password:").strip() +# Required only if you are using a private registry different than mcr. +# DOCKER_USERNAME = input("Provide your Docker username:").strip() +# DOCKER_PASSWORD = getpass.getpass("Provide your Docker password:").strip() # # Optionally change these configuration settings @@ -58,7 +59,7 @@ def executeCmd (cmd): # os.environ['DOCKER_PASSWORD']=DOCKER_PASSWORD os.environ['ACCEPT_EULA']="Yes" -print ("Set azure context to subcription: "+SUBSCRIPTION_ID) +print ("Set azure context to subscription: "+SUBSCRIPTION_ID) command = "az account set -s "+ SUBSCRIPTION_ID executeCmd (command) @@ -77,7 +78,7 @@ def executeCmd (cmd): command="azdata bdc config init --source aks-dev-test --target custom --force" executeCmd (command) -command="azdata bdc config section set -c custom -j ""metadata.name=" + CLUSTER_NAME + "" +command="azdata bdc config replace -c custom/cluster.json -j ""metadata.name=" + CLUSTER_NAME + "" executeCmd (command) # Use this only if you are using a private registry different than default Micrososft registry (mcr). From 515aa264112b4f325afccfbc3540abf8f605dc1c Mon Sep 17 00:00:00 2001 From: Ben Weissman Date: Thu, 22 Aug 2019 05:33:21 +0200 Subject: [PATCH 2/6] Revert "Update deploy-sql-big-data-aks.py" This reverts commit d30fd67dd36944fe332a009e4fcf87d001cc4aeb. --- .../deployment/aks/deploy-sql-big-data-aks.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py index b37d47fe63..e333794dbf 100644 --- a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py +++ b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py @@ -24,9 +24,8 @@ def executeCmd (cmd): # SUBSCRIPTION_ID = input("Provide your Azure subscription ID:").strip() GROUP_NAME = input("Provide Azure resource group name to be created:").strip() -# Required only if you are using a private registry different than mcr. -# DOCKER_USERNAME = input("Provide your Docker username:").strip() -# DOCKER_PASSWORD = getpass.getpass("Provide your Docker password:").strip() +DOCKER_USERNAME = input("Provide your Docker username:").strip() +DOCKER_PASSWORD = getpass.getpass("Provide your Docker password:").strip() # # Optionally change these configuration settings @@ -59,7 +58,7 @@ def executeCmd (cmd): # os.environ['DOCKER_PASSWORD']=DOCKER_PASSWORD os.environ['ACCEPT_EULA']="Yes" -print ("Set azure context to subscription: "+SUBSCRIPTION_ID) +print ("Set azure context to subcription: "+SUBSCRIPTION_ID) command = "az account set -s "+ SUBSCRIPTION_ID executeCmd (command) @@ -78,7 +77,7 @@ def executeCmd (cmd): command="azdata bdc config init --source aks-dev-test --target custom --force" executeCmd (command) -command="azdata bdc config replace -c custom/cluster.json -j ""metadata.name=" + CLUSTER_NAME + "" +command="azdata bdc config section set -c custom -j ""metadata.name=" + CLUSTER_NAME + "" executeCmd (command) # Use this only if you are using a private registry different than default Micrososft registry (mcr). From d6d899527c62e65079496668368fdf67c9074eac Mon Sep 17 00:00:00 2001 From: Ben Weissman Date: Thu, 22 Aug 2019 05:36:45 +0200 Subject: [PATCH 3/6] Update setup-bdc-ad.sh --- .../deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh index 621764588a..4b2552873a 100644 --- a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh +++ b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh @@ -95,6 +95,7 @@ IMAGES=( mssql-appdeploy-init mssql-controller mssql-hadoop + mssql-dns mssql-mleap-serving-runtime mssql-mlserver-py-runtime mssql-mlserver-r-runtime @@ -346,6 +347,7 @@ azdata bdc config init --source kubeadm-dev-test --target kubeadm-custom -f azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.repository=$DOCKER_REPOSITORY" azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.registry=$DOCKER_REGISTRY" azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.imageTag=$DOCKER_TAG" +azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.imagePullPolicy=IfNotPresent" azdata bdc config replace -c kubeadm-custom/cluster.json -j "$.spec.pools[?(@.spec.type == "Data")].spec.replicas=1" azdata bdc config replace -c kubeadm-custom/control.json -j "spec.storage.data.className=$STORAGE_CLASS" azdata bdc config replace -c kubeadm-custom/control.json -j "spec.storage.logs.className=$STORAGE_CLASS" From effcdd37c1b1b99f4d8ac1b9e0fb2f680539bdf7 Mon Sep 17 00:00:00 2001 From: Ben Weissman Date: Sat, 31 Aug 2019 07:16:37 +0200 Subject: [PATCH 4/6] Update deploy-sql-big-data-aks.py --- .../deployment/aks/deploy-sql-big-data-aks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py index 1b0524e41d..ef5bfe17c5 100644 --- a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py +++ b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py @@ -78,7 +78,7 @@ def executeCmd (cmd): command="azdata bdc config init --source aks-dev-test --target custom --force" executeCmd (command) -command="azdata bdc config replace -c custom/cluster.json -j ""metadata.name=" + CLUSTER_NAME + "" +command="azdata bdc config replace -c custom/bdc.json -j ""metadata.name=" + CLUSTER_NAME + "" executeCmd (command) # Use this only if you are using a private registry different than default Micrososft registry (mcr). From 2c83936ac713a02804372ba87e0dc5ef48a5b5be Mon Sep 17 00:00:00 2001 From: Ben Weissman Date: Sat, 31 Aug 2019 07:23:10 +0200 Subject: [PATCH 5/6] Update setup-bdc-ad.sh --- .../kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh index 4b2552873a..211c26b463 100644 --- a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh +++ b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh @@ -95,7 +95,6 @@ IMAGES=( mssql-appdeploy-init mssql-controller mssql-hadoop - mssql-dns mssql-mleap-serving-runtime mssql-mlserver-py-runtime mssql-mlserver-r-runtime @@ -347,7 +346,6 @@ azdata bdc config init --source kubeadm-dev-test --target kubeadm-custom -f azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.repository=$DOCKER_REPOSITORY" azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.registry=$DOCKER_REGISTRY" azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.imageTag=$DOCKER_TAG" -azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.imagePullPolicy=IfNotPresent" azdata bdc config replace -c kubeadm-custom/cluster.json -j "$.spec.pools[?(@.spec.type == "Data")].spec.replicas=1" azdata bdc config replace -c kubeadm-custom/control.json -j "spec.storage.data.className=$STORAGE_CLASS" azdata bdc config replace -c kubeadm-custom/control.json -j "spec.storage.logs.className=$STORAGE_CLASS" @@ -375,4 +373,3 @@ fi echo "alias azdata='$BDCDEPLOY_DIR/$VIRTUALENV_NAME/bin/azdata'" >> $HOME/.bashrc }| tee $LOG_FILE - From dbc2a33b35f69adb915dd9385590baa386059d41 Mon Sep 17 00:00:00 2001 From: Ben Weissman Date: Sat, 31 Aug 2019 07:23:49 +0200 Subject: [PATCH 6/6] Update setup-bdc-ad.sh --- .../deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh index 211c26b463..621764588a 100644 --- a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh +++ b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm-ad/setup-bdc-ad.sh @@ -373,3 +373,4 @@ fi echo "alias azdata='$BDCDEPLOY_DIR/$VIRTUALENV_NAME/bin/azdata'" >> $HOME/.bashrc }| tee $LOG_FILE +