Skip to content

Commit b0d2f6e

Browse files
authored
Merge pull request #624 from microsoft/rc1-bdc
Update BDC deployment samples to SQL Server 2019 RC1
2 parents 5bee11e + cba1ecb commit b0d2f6e

2 files changed

Lines changed: 32 additions & 24 deletions

File tree

samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RETRY_INTERVAL=5
4646
#
4747
export DOCKER_REGISTRY="mcr.microsoft.com"
4848
export DOCKER_REPOSITORY="mssql/bdc"
49-
export DOCKER_TAG="2019-CTP3.2-ubuntu"
49+
export DOCKER_TAG="2019-RC1-ubuntu"
5050

5151
# Variables used for azdata cluster creation.
5252
#
@@ -60,9 +60,10 @@ export STORAGE_CLASS=local-storage
6060
export PV_COUNT="30"
6161

6262
IMAGES=(
63-
mssql-app-service-proxy
64-
mssql-appdeploy-init
63+
mssql-app-service-proxy
64+
mssql-control-watchdog
6565
mssql-controller
66+
mssql-dns
6667
mssql-hadoop
6768
mssql-mleap-serving-runtime
6869
mssql-mlserver-py-runtime
@@ -74,10 +75,13 @@ IMAGES=(
7475
mssql-monitor-influxdb
7576
mssql-monitor-kibana
7677
mssql-monitor-telegraf
78+
mssql-security-domainctl
7779
mssql-security-knox
7880
mssql-security-support
81+
mssql-server
7982
mssql-server-controller
8083
mssql-server-data
84+
mssql-server-ha
8185
mssql-service-proxy
8286
mssql-ssis-app-runtime
8387
)
@@ -313,7 +317,7 @@ azdata bdc config init --source kubeadm-dev-test --target kubeadm-custom -f
313317
azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.repository=$DOCKER_REPOSITORY"
314318
azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.registry=$DOCKER_REGISTRY"
315319
azdata bdc config replace -c kubeadm-custom/control.json -j ".spec.docker.imageTag=$DOCKER_TAG"
316-
azdata bdc config replace -c kubeadm-custom/cluster.json -j "$.spec.pools[?(@.spec.type == "Data")].spec.replicas=1"
320+
azdata bdc config replace -c kubeadm-custom/bdc.json -j "$.spec.resources.data-0.spec.replicas=1"
317321
azdata bdc config replace -c kubeadm-custom/control.json -j "spec.storage.data.className=$STORAGE_CLASS"
318322
azdata bdc config replace -c kubeadm-custom/control.json -j "spec.storage.logs.className=$STORAGE_CLASS"
319323
azdata bdc create -c kubeadm-custom --accept-eula $ACCEPT_EULA

samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,30 @@ def execute_cmd (cmd):
2626
TARGET_DOCKER_PASSWORD = getpass.getpass("Provide Docker password for the target registry:")
2727
TARGET_DOCKER_TAG = input("Provide Docker tag for the images at the target: ") or "latest"
2828

29-
images = [ 'mssql-appdeploy-init',
30-
'mssql-monitor-fluentbit',
31-
'mssql-monitor-collectd',
32-
'mssql-server-data',
33-
'mssql-hadoop',
34-
'mssql-monitor-elasticsearch',
35-
'mssql-monitor-influxdb',
36-
'mssql-security-knox',
37-
'mssql-mlserver-r-runtime',
38-
'mssql-mlserver-py-runtime',
39-
'mssql-controller',
40-
'mssql-mleap-serving-runtime',
41-
'mssql-server-controller',
42-
'mssql-monitor-grafana',
43-
'mssql-monitor-kibana',
44-
'mssql-service-proxy',
45-
'mssql-app-service-proxy',
46-
'mssql-ssis-app-runtime',
47-
'mssql-monitor-telegraf',
48-
'mssql-security-support']
29+
images = ['mssql-app-service-proxy',
30+
'mssql-control-watchdog'
31+
'mssql-controller'
32+
'mssql-dns'
33+
'mssql-hadoop'
34+
'mssql-mleap-serving-runtime'
35+
'mssql-mlserver-py-runtime'
36+
'mssql-mlserver-r-runtime'
37+
'mssql-monitor-collectd'
38+
'mssql-monitor-elasticsearch'
39+
'mssql-monitor-fluentbit'
40+
'mssql-monitor-grafana'
41+
'mssql-monitor-influxdb'
42+
'mssql-monitor-kibana'
43+
'mssql-monitor-telegraf'
44+
'mssql-security-domainctl'
45+
'mssql-security-knox'
46+
'mssql-security-support'
47+
'mssql-server'
48+
'mssql-server-controller'
49+
'mssql-server-data'
50+
'mssql-server-ha'
51+
'mssql-service-proxy'
52+
'mssql-ssis-app-runtime']
4953

5054
# Use this only if your source is a private Docker registry
5155
# print("Execute docker login to source registry: " + SOURCE_DOCKER_REGISTRY)

0 commit comments

Comments
 (0)