Merge pull request #8 from microsoft/master

merge from master

samples/features/sql-big-data-cluster/deployment/README.md

@@ -19,3 +19,6 @@ Using the sample Python script in **offline** folder, you will push the necessar
 
 Using the sample Python script in **private-aks** folder, you will Deploy SQL Server big data cluster in in your private network with Azure Kubernetes service (AKS) private cluster.
 
+## __[OpenShift manifests and scripts](openshift/)__
+
+Use manifests and scripts in **openshift** folder, to support SQL Server Big Data Clusters on OpenShift.

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

@@ -7,7 +7,6 @@ fi
 DIR_PREFIX=$1
 
 kubeadm reset --force
-unalias azdata
 
 systemctl stop kubelet
 rm -rf /var/lib/cni/
@@ -23,8 +22,12 @@ ip link set flannel.1 down
 #brctl delbr flannel.1
 iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X
 
-rm -rf .azdata/
-rm -rf bdcdeploy/
+# Remove azdata
+#
+apt-get remove -y azdata-cli
+rm /etc/apt/sources.list.d/azdata-cli.list
+rm /etc/apt/trusted.gpg.d/dpgswdist.v1.asc.gpg
+apt autoremove
 
 # Remove mounts.
 #

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

@@ -47,14 +47,10 @@ export VIRTUALENV_NAME="bdcvenv"
 export LOG_FILE="bdcdeploy.log"
 export DEBIAN_FRONTEND=noninteractive
 
-# Requirements file.
-#
-export REQUIREMENTS_LINK="https://aka.ms/azdata"
-
 # Kube version.
 #
-KUBE_DPKG_VERSION=1.15.0-00
-KUBE_VERSION=1.15.0
+KUBE_DPKG_VERSION=1.16.3-00
+KUBE_VERSION=1.16.3
 
 # Wait for 5 minutes for the cluster to be ready.
 #
@@ -65,7 +61,7 @@ RETRY_INTERVAL=5
 #
 export DOCKER_REGISTRY="mcr.microsoft.com"
 export DOCKER_REPOSITORY="mssql/bdc"
-export DOCKER_TAG="2019-CU5-ubuntu-16.04"
+export DOCKER_TAG="2019-CU8-ubuntu-16.04"
 
 # Variables used for azdata cluster creation.
 #
@@ -77,7 +73,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
@@ -97,7 +93,7 @@ IMAGES=(
         mssql-server-controller
         mssql-server-data
         mssql-ha-operator
-	mssql-ha-supervisor
+	    mssql-ha-supervisor
         mssql-service-proxy
         mssql-ssis-app-runtime
 )
@@ -124,6 +120,9 @@ apt --yes install \
     software-properties-common \
     apt-transport-https \
     ca-certificates \
+    lsb-release \
+    gnupg \
+    wget \
     curl
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -132,31 +131,34 @@ add-apt-repository \
     "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 
 apt update -q
-apt-get install -q --yes docker-ce=18.06.2~ce~3-0~ubuntu --allow-downgrades
-apt-mark hold docker-ce
+apt-cache policy docker-ce
+apt --yes install docker-ce
 
 usermod --append --groups docker $USER
 
-# Install python3, python3-pip, requests.
-#
-apt-get install -q -y python3 
-apt-get install -q -y python3-pip
-apt-get install -y libkrb5-dev
-apt-get install -y libsqlite3-dev
-apt-get install -y unixodbc-dev
-
-pip3 install requests --upgrade
-
-# Install and create virtualenv.
-#
-pip3 install --upgrade virtualenv
-virtualenv -p python3 $VIRTUALENV_NAME
-source $VIRTUALENV_NAME/bin/activate
 
 # Install azdata cli.
 #
-pip3 install -r $REQUIREMENTS_LINK
-echo "Packages installed." 
+curl -sL https://packages.microsoft.com/keys/microsoft.asc |
+gpg --dearmor |
+tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
+
+code=$(lsb_release -cs)
+if [ $code == "focal" ]; then
+   add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/prod.list)"
+elif [ $code == "bionic" ]; then
+   add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/prod.list)"
+elif [ $code == "xenial" ]; then
+   add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/prod.list)"
+fi
+
+apt-get update
+apt-get install -y azdata-cli
+
+cd -
+
+azdata --version
+echo "Azdata has been successfully installed."
 
 # Load all pre-requisites for Kubernetes.
 #
@@ -351,10 +353,3 @@ kubectl config set-context --current --namespace $CLUSTER_NAME
 #
 azdata login -n $CLUSTER_NAME
 azdata bdc endpoint list --output table
-
-if [ -d "$HOME/.azdata/" ]; then
-        sudo chown -R $(id -u $SUDO_USER):$(id -g $SUDO_USER) $HOME/.azdata/
-fi
-
-echo "alias azdata='$BDCDEPLOY_DIR/$VIRTUALENV_NAME/bin/azdata'" >> $HOME/.bashrc
-}| tee $LOG_FILE

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

@@ -7,7 +7,6 @@ fi
 DIR_PREFIX=$1
 
 kubeadm reset --force
-unalias azdata
 
 systemctl stop kubelet
 rm -rf /var/lib/cni/
@@ -23,8 +22,12 @@ ip link set flannel.1 down
 #brctl delbr flannel.1
 iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X
 
-rm -rf .azdata/
-rm -rf bdcdeploy/
+# Remove azdata
+#
+apt-get remove -y azdata-cli
+rm /etc/apt/sources.list.d/azdata-cli.list
+rm /etc/apt/trusted.gpg.d/dpgswdist.v1.asc.gpg
+apt autoremove
 
 # Remove mounts.
 #

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

@@ -30,12 +30,12 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Requirements file.
 #
-export REQUIREMENTS_LINK="https://aka.ms/azdata"
+# export REQUIREMENTS_LINK="https://aka.ms/azdata"
 
 # Kube version.
 #
-KUBE_DPKG_VERSION=1.15.0-00
-KUBE_VERSION=1.15.0
+KUBE_DPKG_VERSION=1.16.3-00
+KUBE_VERSION=1.16.3
 
 # Wait for 5 minutes for the cluster to be ready.
 #
@@ -46,7 +46,7 @@ RETRY_INTERVAL=5
 #
 export DOCKER_REGISTRY="mcr.microsoft.com"
 export DOCKER_REPOSITORY="mssql/bdc"
-export DOCKER_TAG="2019-CU5-ubuntu-16.04"
+export DOCKER_TAG="2019-CU8-ubuntu-16.04"
 
 # Variables used for azdata cluster creation.
 #
@@ -58,7 +58,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
@@ -78,7 +78,7 @@ IMAGES=(
         mssql-server-controller
         mssql-server-data
         mssql-ha-operator
-	mssql-ha-supervisor
+	    mssql-ha-supervisor
         mssql-service-proxy
         mssql-ssis-app-runtime
 )
@@ -105,39 +105,51 @@ apt --yes install \
     software-properties-common \
     apt-transport-https \
     ca-certificates \
+    lsb-release \
+    gnupg \
+    wget \
     curl
 
+
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 
 add-apt-repository \
     "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 
 apt update -q
-apt-get install -q --yes docker-ce=18.06.2~ce~3-0~ubuntu --allow-downgrades
-apt-mark hold docker-ce
+apt-cache policy docker-ce
+apt --yes install docker-ce
 
 usermod --append --groups docker $USER
 
 # Install python3, python3-pip, requests.
 #
-apt-get install -q -y python3 
-apt-get install -q -y python3-pip
-apt-get install -y libkrb5-dev
-apt-get install -y libsqlite3-dev
-apt-get install -y unixodbc-dev
+apt install -y libodbc1 odbcinst odbcinst1debian2 unixodbc apt-transport-https libkrb5-dev
 
-pip3 install requests --upgrade
-
-# Install and create virtualenv.
+# Download and install azdata package
 #
-pip3 install --upgrade virtualenv
-virtualenv -p python3 $VIRTUALENV_NAME
-source $VIRTUALENV_NAME/bin/activate
+echo ""
 
-# Install azdata cli.
-#
-pip3 install -r $REQUIREMENTS_LINK
-echo "Packages installed." 
+curl -sL https://packages.microsoft.com/keys/microsoft.asc |
+gpg --dearmor |
+tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null
+
+code=$(lsb_release -cs)
+if [ $code == "focal" ]; then
+   add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/prod.list)"
+elif [ $code == "bionic" ]; then
+   add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/18.04/prod.list)"
+elif [ $code == "xenial" ]; then
+   add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/16.04/prod.list)"
+fi
+
+apt-get update
+apt-get install -y azdata-cli
+
+cd -
+
+azdata --version
+echo "Azdata has been successfully installed."
 
 # Load all pre-requisites for Kubernetes.
 #
@@ -331,10 +343,3 @@ kubectl config set-context --current --namespace $CLUSTER_NAME
 #
 azdata login -n $CLUSTER_NAME
 azdata bdc endpoint list --output table
-
-if [ -d "$HOME/.azdata/" ]; then
-        sudo chown -R $(id -u $SUDO_USER):$(id -g $SUDO_USER) $HOME/.azdata/
-fi
-
-echo "alias azdata='$BDCDEPLOY_DIR/$VIRTUALENV_NAME/bin/azdata'" >> $HOME/.bashrc
-}| tee $LOG_FILE

samples/features/sql-big-data-cluster/deployment/openshift/bdc-scc.yaml

@@ -0,0 +1,39 @@
+apiVersion: security.openshift.io/v1
+kind: SecurityContextConstraints
+metadata:
+  annotations:
+    kubernetes.io/description: SQL Server BDC custom scc is based on 'nonroot' scc plus additional capabilities.
+  generation: 2
+  name: bdc-scc
+allowHostDirVolumePlugin: false
+allowHostIPC: false
+allowHostNetwork: false
+allowHostPID: false
+allowHostPorts: false
+allowPrivilegeEscalation: true
+allowPrivilegedContainer: false
+allowedCapabilities:
+  - SETUID
+  - SETGID
+  - CHOWN
+  - SYS_PTRACE
+defaultAddCapabilities: null
+fsGroup:
+  type: RunAsAny
+readOnlyRootFilesystem: false
+requiredDropCapabilities:
+  - KILL
+  - MKNOD
+runAsUser:
+  type: MustRunAsNonRoot
+seLinuxContext:
+  type: MustRunAs
+supplementalGroups:
+  type: RunAsAny
+volumes:
+  - configMap
+  - downwardAPI
+  - emptyDir
+  - persistentVolumeClaim
+  - projected
+  - secret