From 7b9cafba44da255d0fcbb09b32f399614eba999b Mon Sep 17 00:00:00 2001 From: Mihaela Blendea Date: Wed, 21 Aug 2019 17:14:58 -0700 Subject: [PATCH 1/4] Update push-bdc-images-to-custom-private-repo.py --- .../push-bdc-images-to-custom-private-repo.py | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py b/samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py index 93c6db96cf..6e5a828744 100644 --- a/samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py +++ b/samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py @@ -26,26 +26,30 @@ def execute_cmd (cmd): TARGET_DOCKER_PASSWORD = getpass.getpass("Provide Docker password for the target registry:") TARGET_DOCKER_TAG = input("Provide Docker tag for the images at the target: ") or "latest" -images = [ 'mssql-appdeploy-init', - 'mssql-monitor-fluentbit', - 'mssql-monitor-collectd', - 'mssql-server-data', - 'mssql-hadoop', - 'mssql-monitor-elasticsearch', - 'mssql-monitor-influxdb', - 'mssql-security-knox', - 'mssql-mlserver-r-runtime', - 'mssql-mlserver-py-runtime', - 'mssql-controller', - 'mssql-mleap-serving-runtime', - 'mssql-server-controller', - 'mssql-monitor-grafana', - 'mssql-monitor-kibana', - 'mssql-service-proxy', - 'mssql-app-service-proxy', - 'mssql-ssis-app-runtime', - 'mssql-monitor-telegraf', - 'mssql-security-support'] +images = ['mssql-app-service-proxy', + 'mssql-control-watchdog' + 'mssql-controller' + 'mssql-dns' + 'mssql-hadoop' + 'mssql-mleap-serving-runtime' + 'mssql-mlserver-py-runtime' + 'mssql-mlserver-r-runtime' + 'mssql-monitor-collectd' + 'mssql-monitor-elasticsearch' + 'mssql-monitor-fluentbit' + 'mssql-monitor-grafana' + 'mssql-monitor-influxdb' + 'mssql-monitor-kibana' + 'mssql-monitor-telegraf' + 'mssql-security-domainctl' + 'mssql-security-knox' + 'mssql-security-support' + 'mssql-server' + 'mssql-server-controller' + 'mssql-server-data' + 'mssql-server-ha' + 'mssql-service-proxy' + 'mssql-ssis-app-runtime'] # Use this only if your source is a private Docker registry # print("Execute docker login to source registry: " + SOURCE_DOCKER_REGISTRY) From 27e90114dac760b21dbf949c8a41878a39331b28 Mon Sep 17 00:00:00 2001 From: Mihaela Blendea Date: Fri, 23 Aug 2019 15:24:26 -0700 Subject: [PATCH 2/4] Update setup-bdc.sh --- .../kubeadm/ubuntu-single-node-vm/setup-bdc.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh index 07112b2535..9d76286122 100644 --- a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh +++ b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh @@ -46,7 +46,7 @@ RETRY_INTERVAL=5 # export DOCKER_REGISTRY="mcr.microsoft.com" export DOCKER_REPOSITORY="mssql/bdc" -export DOCKER_TAG="2019-CTP3.2-ubuntu" +export DOCKER_TAG="2019-RC1-ubuntu" # Variables used for azdata cluster creation. # @@ -60,9 +60,10 @@ export STORAGE_CLASS=local-storage export PV_COUNT="30" IMAGES=( - mssql-app-service-proxy - mssql-appdeploy-init + mssql-app-service-proxy + mssql-control-watchdog mssql-controller + mssql-dns mssql-hadoop mssql-mleap-serving-runtime mssql-mlserver-py-runtime @@ -74,10 +75,13 @@ IMAGES=( mssql-monitor-influxdb mssql-monitor-kibana mssql-monitor-telegraf + mssql-security-domainctl mssql-security-knox mssql-security-support + mssql-server mssql-server-controller mssql-server-data + mssql-server-ha mssql-service-proxy mssql-ssis-app-runtime ) From ea740911b4809d7d70353bcd8d55bd11cd76b92f Mon Sep 17 00:00:00 2001 From: Mihaela Blendea Date: Fri, 23 Aug 2019 15:25:05 -0700 Subject: [PATCH 3/4] Update setup-bdc.sh --- .../deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh index 9d76286122..2c2f581f48 100644 --- a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh +++ b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh @@ -60,7 +60,7 @@ export STORAGE_CLASS=local-storage export PV_COUNT="30" IMAGES=( - mssql-app-service-proxy + mssql-app-service-proxy mssql-control-watchdog mssql-controller mssql-dns From cba1ecb8ca770d34b60603a20d45d0162dd92851 Mon Sep 17 00:00:00 2001 From: Travis Wright Date: Wed, 28 Aug 2019 22:57:55 -0700 Subject: [PATCH 4/4] Fixing bug in azdata bdc config replace command File name changed, JSON document structure changed. Made a change here to match both of the new requirements for RC1. --- .../deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh index 2c2f581f48..d2217c76ac 100644 --- a/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh +++ b/samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh @@ -317,7 +317,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/cluster.json -j "$.spec.pools[?(@.spec.type == "Data")].spec.replicas=1" +azdata bdc config replace -c kubeadm-custom/bdc.json -j "$.spec.resources.data-0.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" azdata bdc create -c kubeadm-custom --accept-eula $ACCEPT_EULA