@@ -47,14 +47,10 @@ export VIRTUALENV_NAME="bdcvenv"
4747export LOG_FILE=" bdcdeploy.log"
4848export DEBIAN_FRONTEND=noninteractive
4949
50- # Requirements file.
51- #
52- export REQUIREMENTS_LINK=" https://aka.ms/azdata"
53-
5450# Kube version.
5551#
56- KUBE_DPKG_VERSION=1.15.0 -00
57- KUBE_VERSION=1.15.0
52+ KUBE_DPKG_VERSION=1.16.3 -00
53+ KUBE_VERSION=1.16.3
5854
5955# Wait for 5 minutes for the cluster to be ready.
6056#
@@ -65,7 +61,7 @@ RETRY_INTERVAL=5
6561#
6662export DOCKER_REGISTRY=" mcr.microsoft.com"
6763export DOCKER_REPOSITORY=" mssql/bdc"
68- export DOCKER_TAG=" 2019-CU5 -ubuntu-16.04"
64+ export DOCKER_TAG=" 2019-CU8 -ubuntu-16.04"
6965
7066# Variables used for azdata cluster creation.
7167#
@@ -77,7 +73,7 @@ export STORAGE_CLASS=local-storage
7773export PV_COUNT=" 30"
7874
7975IMAGES=(
80- mssql-app-service-proxy
76+ mssql-app-service-proxy
8177 mssql-control-watchdog
8278 mssql-controller
8379 mssql-dns
@@ -97,7 +93,7 @@ IMAGES=(
9793 mssql-server-controller
9894 mssql-server-data
9995 mssql-ha-operator
100- mssql-ha-supervisor
96+ mssql-ha-supervisor
10197 mssql-service-proxy
10298 mssql-ssis-app-runtime
10399)
@@ -124,6 +120,9 @@ apt --yes install \
124120 software-properties-common \
125121 apt-transport-https \
126122 ca-certificates \
123+ lsb-release \
124+ gnupg \
125+ wget \
127126 curl
128127
129128curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -132,31 +131,34 @@ add-apt-repository \
132131 " deb [arch=amd64] https://download.docker.com/linux/ubuntu $( lsb_release -cs) stable"
133132
134133apt update -q
135- apt-get install -q --yes docker-ce=18.06.2~ce~3-0~ubuntu --allow-downgrades
136- apt-mark hold docker-ce
134+ apt-cache policy docker-ce
135+ apt --yes install docker-ce
137136
138137usermod --append --groups docker $USER
139138
140- # Install python3, python3-pip, requests.
139+
140+ # Install azdata cli.
141141#
142- apt-get install -q -y python3
143- apt-get install -q -y python3-pip
144- apt-get install -y libkrb5-dev
145- apt-get install -y libsqlite3-dev
146- apt-get install -y unixodbc-dev
142+ curl -sL https://packages.microsoft.com/keys/microsoft.asc |
143+ gpg --dearmor |
144+ tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
145+
146+ code=$( lsb_release -cs)
147+ if [ $code == " focal" ]; then
148+ add-apt-repository " $( wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/prod.list) "
149+ elif [ $code == " bionic" ]; then
150+ add-apt-repository " $( wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/prod.list) "
151+ elif [ $code == " xenial" ]; then
152+ add-apt-repository " $( wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/prod.list) "
153+ fi
147154
148- pip3 install requests --upgrade
155+ apt-get update
156+ apt-get install -y azdata-cli
149157
150- # Install and create virtualenv.
151- #
152- pip3 install --upgrade virtualenv
153- virtualenv -p python3 $VIRTUALENV_NAME
154- source $VIRTUALENV_NAME /bin/activate
158+ cd -
155159
156- # Install azdata cli.
157- #
158- pip3 install -r $REQUIREMENTS_LINK
159- echo " Packages installed."
160+ azdata --version
161+ echo " Azdata has been successfully installed."
160162
161163# Load all pre-requisites for Kubernetes.
162164#
@@ -351,10 +353,3 @@ kubectl config set-context --current --namespace $CLUSTER_NAME
351353#
352354azdata login -n $CLUSTER_NAME
353355azdata bdc endpoint list --output table
354-
355- if [ -d " $HOME /.azdata/" ]; then
356- sudo chown -R $( id -u $SUDO_USER ) :$( id -g $SUDO_USER ) $HOME /.azdata/
357- fi
358-
359- echo " alias azdata='$BDCDEPLOY_DIR /$VIRTUALENV_NAME /bin/azdata'" >> $HOME /.bashrc
360- }| tee $LOG_FILE
0 commit comments