For #131: Update deployment scripts

Author: dhruvit-r

deployment/deploy-all.sh

@@ -3,6 +3,7 @@ set -e
 SCRIPT_DIR="$(realpath "$(dirname "$0")")"
 pushd "$SCRIPT_DIR"
 ./create-eks.sh
+./deploy-nginx.sh
 ./deploy-presidio.sh
 ./deploy-dlp-trigger.sh
 popd

deployment/deploy-dlp-trigger.sh

@@ -3,10 +3,22 @@ set -e
 SCRIPT_DIR="$(realpath "$(dirname "$0")")"
 source "$SCRIPT_DIR/env.sh"
 
-analyzer_hostname=$(kubectl get service presidio-presidio-analyzer \
-  --namespace presidio \
-  --output jsonpath='{.status.loadBalancer.ingress[0].hostname}')
-export PRESIDIO_ENDPOINT=http://$analyzer_hostname/analyze
+analyzer_hostname=""
+while [ -z $analyzer_hostname ]; do
+  echo "Waiting for end point..."
+  analyzer_hostname=$(kubectl get ingress presidio-ingress \
+    -n presidio \
+    --output jsonpath='{.status.loadBalancer.ingress[0].hostname}' \
+  )
+  [ -z "$analyzer_hostname" ] && sleep 5
+done
+
+endpoint_basepath=$(kubectl get ingress presidio-ingress \
+  -n presidio \
+  --output jsonpath='{.spec.rules[0].http.paths[0].backend.serviceName}' \
+)
+
+export PRESIDIO_ENDPOINT=https://$analyzer_hostname/$endpoint_basepath/analyze
 
 pushd "${SCRIPT_DIR}/.."
 serverless deploy

deployment/deploy-nginx.sh

@@ -0,0 +1,11 @@
+# Add Helm Repo
+  helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+  # Install NGINX
+  helm install nginx-ingress ingress-nginx/ingress-nginx \
+    --namespace ingress-basic \
+    --create-namespace \
+    --set controller.replicaCount=2 \
+    --set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
+    --set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
+    --set controller.admissionWebhooks.patch.nodeSelector."beta\.kubernetes\.io/os"=linux \
+    --wait || true

deployment/deploy-presidio.sh

@@ -3,4 +3,4 @@ set -e
 REGISTRY=${1:-mcr.microsoft.com}
 TAG=${2:-latest}
 RELEASE=${3:-presidio}
-helm install $RELEASE --set registry=$REGISTRY,tag=$TAG ./charts/presidio --namespace presidio --create-namespace
+helm upgrade $RELEASE --set registry=$REGISTRY,tag=$TAG ./charts/presidio --namespace presidio --create-namespace --install