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..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 @@ -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 ) @@ -313,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 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)