force bash (#437)

* [Scripts] Force bash

Author: Corneil du Plessis

performance-tests/README.adoc

@@ -5,7 +5,7 @@ This module contains code to create CF tasks that populate the SCDF database wit
 The platform initialization relies on The acceptance test code to set up SCDF on CF, then run scripts to build and deploy the tasks from the corresponding Java apps:
 
 ```
-#!/usr/bin/env bash
+#!/usr/bin/bash
 export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL=${bamboo.CLOUDFOUNDRY_URL}
 export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG=${bamboo.CLOUDFOUNDRY_ORG}
 export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE=${bamboo.CLOUDFOUNDRY_SPACE}

performance-tests/common.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 get_db_service_instance() {
   service=$(cf services | grep p-dataflow-relational | awk '{print $1}')

performance-tests/initialize-cf-tile-streams.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 . ./common.sh
 

performance-tests/initialize-cf-tile-tasks.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 . ./common.sh
 

scdf_cf_setup/import_uaa_certs.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 if [[ -z "$1" ]]; then
   echo "No cert_host provided"
   echo "Usage $0 cert_host"

scripts/at-cleanup.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 pushd $SETUP_TOOL_REPO  > /dev/null
     echo "PYTHONPATH=$PYTHONPATH"
     echo "Cleanup CF environment"

src/local/README.adoc

@@ -6,6 +6,12 @@ You will need to install kubectl and then kind or minikube for a local cluster.
 
 _How do I choose between minikube and kind? kind will generally provide quicker setup and teardown time than Minikube. There is little to choose in terms of performance between the 2 apart from being able to configure limits on CPUs and memory when deploying minikube. So in the case where you have memory constraints minikube will be a better option._
 
+=== macOS
+
+Install realpath from https://ports.macports.org/port/realpath/[Macports] or `brew install realpath`
+
+NOTE: The scripts have been developed for and tested on Bash.
+
 == Steps
 * Choose Kubernetes provider. Kind, Minikube or remote GKE or TMC
 * Decide the namespace to use for deployment if not `default`
@@ -35,6 +41,8 @@ Minikube uses one of a selection of drivers to provide a virtualization environm
 * https://minikube.sigs.k8s.io/docs/start/[Installation]
 * https://minikube.sigs.k8s.io/docs/start/#loadbalancer-deployments[LoadBalancer]
 
+NOTE: Delete existing Minikube installation if you have any. `minikube delete`
+
 === Remote TMC Cluster
 
 https://tanzu.vmware.com/mission-control[Tanzu Mission Control]
@@ -134,6 +142,18 @@ The following list of utilities may prove useful.
 | https://github.com/boz/kail[kail] | Extra and tail the logs of various pods based on various naming criteria.
 |===
 
+=== `kail`
+
+
+* Using kail to log activity related to a specific stream.
+```shell
+kail --label=spring-group-id=<stream-name>
+```
+* Using kail to log all pods in specific namespace.
+```shell
+kail --ns=<namespace>
+```
+
 == Scripts
 
 [cols="5m,7"]

src/local/build-app-images.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 
 set -e

src/local/build-dataflow-image.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 if [ "$DATAFLOW_VERSION" = "" ]; then
   DATAFLOW_VERSION=2.10.0-SNAPSHOT

src/local/build-scdf-pro-image.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 if [ "$SCDF_PRO_VERSION" = "" ]; then
   SCDF_PRO_VERSION=1.5.0-SNAPSHOT

src/local/build-skipper-image.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 if [ "$SKIPPER_VERSION" = "" ]; then
   SKIPPER_VERSION=2.9.0-SNAPSHOT

src/local/configure-k8s.sh

@@ -1,4 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
+bold="\033[1m"
+dim="\033[2m"
+end="\033[0m"
+
 if [ "$NS" = "" ]; then
   echo "NS not defined" >&2
   exit 2
@@ -18,13 +23,13 @@ case "$K8S_DRIVER" in
   ;;
 "gke")
   if [ "$GKE_CLUSTER" = "" ]; then
-    echo "Cannot find environmental variable GKE_CLUSTER" >&2
+    echo -e "${bold}Cannot find environmental variable GKE_CLUSTER${end}" >&2
     exit 2
   fi
   ;;
 "tmc")
   if [ "$TMC_CLUSTER" = "" ]; then
-    echo "Cannot find environmental variable TMC_CLUSTER" >&2
+    echo -e "${bold}Cannot find environmental variable TMC_CLUSTER${end}" >&2
     exit 2
   fi
   if [ "$KUBECONFIG" = "" ]; then
@@ -36,7 +41,7 @@ case "$K8S_DRIVER" in
   echo "Creating Minikube cluster with $K8S_DRIVER"
   # K8S_DRIVER=kvm2, docker, vmware, virtualbox, podman, vmwarefusion or hyperkit
   minikube start --cpus=8 --memory=16g "--driver=$K8S_DRIVER" "--kubernetes-version=$K8S_VERSION"
-  echo "Please run 'minikube tunnel' in a separate shell to ensure a LoadBalancer is active."
+  echo -e "Please run ${bold}'minikube tunnel'${end} in a separate shell to ensure a LoadBalancer is active."
   ;;
 esac
 COUNT=$(kubectl get namespaces | grep -c "$NS")
@@ -48,4 +53,4 @@ if [ "$K8S_DRIVER" = "kind" ]; then
 fi
 end_time=$(date +%s)
 elapsed=$((end_time - start_time))
-echo "Kubernetes on $K8S_DRIVER running in $elapsed seconds"
+echo -e "Kubernetes on $K8S_DRIVER running in ${bold}$elapsed${end} seconds"

src/local/delete-scdf.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 kubectl delete deployments --all $WAIT --namespace="$NS"
 kubectl delete statefulsets --all $WAIT --namespace="$NS"

src/local/deploy-scdf.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ "$NS" = "" ]; then
   echo "NS not defined" >&2
   exit 0

src/local/destroy-k8s.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 kubectl_pid=$(ps aux | grep 'kubectl' | grep 'port\-forward' | awk '{print $2}')
 if [ "$kubectl_pid" != "" ]

src/local/export-dataflow-ip.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 (return 0 2>/dev/null) && sourced=1 || sourced=0
 
 if [ "$NS" = "" ]; then

src/local/export-http-url.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 PARENT=$(realpath "$SCDIR/../../..")
 if [ "$DATAFLOW_IP" = "" ]; then

src/local/forward-scdf.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 (return 0 2>/dev/null) && sourced=1 || sourced=0
 
 FWSCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")

src/local/install-scdf.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ "$NS" = "" ]; then
   echo "NS not defined" >&2
   exit 2

src/local/load-image.sh

@@ -1,12 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
 if [ "$K8S_DRIVER" = "" ]; then
   K8S_DRIVER=kind
 fi
 
 set -e
 if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ] ; then
   DONT_PULL=$3
-  if [[ "$2" == "" ]]; then
+  if [[ "$2" = "" ]]; then
     echo "A TAG is required for $1" >&2
     exit 2
   fi
@@ -61,7 +61,7 @@ if [ "$K8S_DRIVER" != "tmc" ] && [ "$K8S_DRIVER" != "gke" ] ; then
     for did in $DOCKER_IDS; do
       for mid in $MK_IDS; do
         # Docker id may be shorter than Minikube id.
-        if [ "${mid:0:12}" == "${did:0:12}" ]; then
+        if [ "${mid:0:12}" = "${did:0:12}" ]; then
           echo "$IMAGE already uploaded"
           exit 0
         fi

src/local/load-images.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 case $BROKER in
 "" | "kafka")

src/local/local-k8s-test.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-if [ "$1" == "-h" ]; then
+#!/bin/bash
+if [ "$1" = "-h" ]; then
   echo "Usage $0 <test>"
   echo "  where test:"
   echo "    n for test-n-of-3"
@@ -12,11 +12,11 @@ SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 pushd "$SCDIR/../../acceptance-tests/custom-apps/timestamp-batch-with-drivers-template1"  > /dev/null
 ./gradlew build install
 popd > /dev/null # This assumes you are using minikube with helm from bitnami and used release name scdf and executed forward-scdf.sh
-if [ "$DATAFLOW_IP" == "" ]; then
+if [ "$DATAFLOW_IP" = "" ]; then
   echo "DATAFLOW_IP not defined"
   exit 1
 fi
-if [ "$EXTRA" == "" ]; then
+if [ "$EXTRA" = "" ]; then
   export EXTRA="-P test-all"
 fi
 if [ "$1" != "" ]; then
@@ -42,7 +42,7 @@ if [ "$1" != "" ]; then
   esac
 fi
 
-if [ "$BROKER" == "kafka" ]; then
+if [ "$BROKER" = "kafka" ]; then
   export BINDER=kafka
 else
   export BINDER=rabbit

src/local/pull-app-images.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 docker pull springcloudstream/scdf-app-kitchen:1.0.0-SNAPSHOT
 docker pull springcloudstream/scdf-app-customer:1.0.0-SNAPSHOT

src/local/pull-dataflow.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-if [ "$DATAFLOW_VERSION" == "" ]; then
+#!/bin/bash
+if [ "$DATAFLOW_VERSION" = "" ]; then
   DATAFLOW_VERSION=2.10.0-SNAPSHOT
 fi
 docker pull "springcloud/spring-cloud-dataflow-server:$DATAFLOW_VERSION"

src/local/pull-scdf-pro.sh

@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/bin/bash
 docker pull "dev.registry.pivotal.io/p-scdf-for-kubernetes/scdf-pro-repo/scdfpro.tanzu.vmware.com:1.5.0-SNAPSHOT"

src/local/pull-skipper.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-if [ "$SKIPPER_VERSION" == "" ]; then
+#!/bin/bash
+if [ "$SKIPPER_VERSION" = "" ]; then
   SKIPPER_VERSION=2.9.0-SNAPSHOT
 fi
 

src/local/register-apps.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 set -e
 function dataflow_post() {
@@ -16,11 +16,11 @@ function dataflow_post() {
 if [ "$1" != "" ]; then
   PLATFORM_TYPE=$1
 fi
-if [ "$PLATFORM_TYPE" == "" ]; then
+if [ "$PLATFORM_TYPE" = "" ]; then
   PLATFORM_TYPE=kubernetes
 fi
 
-if [ "$DATAFLOW_IP" == "" ]; then
+if [ "$DATAFLOW_IP" = "" ]; then
   source "$SCDIR/export-dataflow-ip.sh"
 fi
 case $BROKER in
@@ -53,7 +53,7 @@ fi
 
 echo "DATAFLOW_IP=$DATAFLOW_IP"
 dataflow_post "uri=https://repo.spring.io/$RELEASE_SNAPSHOT/org/springframework/cloud/stream/app/stream-applications-descriptor/$STREAM_APPS_VERSION/stream-applications-descriptor-$STREAM_APPS_VERSION.stream-apps-$BROKER_NAME-$TYPE" "$DATAFLOW_IP/apps"
-if [ "$TYPE" == "docker" ]; then
+if [ "$TYPE" = "docker" ]; then
   dataflow_post "uri=docker:springcloudtask/timestamp-task:2.0.2" "$DATAFLOW_IP/apps/task/timestamp/2.0.2"
   dataflow_post "uri=docker:springcloudtask/timestamp-batch-task:2.0.2" "$DATAFLOW_IP/apps/task/timestamp-batch/2.0.2"
   dataflow_post "uri=docker:springcloudtask/scenario-task:0.0.1-SNAPSHOT" "$DATAFLOW_IP/apps/task/scenario/0.0.1-SNAPSHOT"

src/local/setup-metallb.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
 
 echo "Deploying Metal LoadBalancer"

src/local/tmc/delete-cluster.sh

@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
-if [ "$TMC_CLUSTER" == "" ]; then
+#!/bin/bash
+if [ "$TMC_CLUSTER" = "" ]; then
   echo "TMC_CLUSTER environmental variable not found" >&2
   exit 2
 fi
-if [ "$NS" == "" ]; then
+if [ "$NS" = "" ]; then
   echo "NS not defined" >&2
   exit 2
 fi

src/local/tmc/set-cluster.sh

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # export TMC_CLUSTER=scdf-manual-empty-1654874129329054695
-if [ "$TMC_CLUSTER" == "" ]; then
+if [ "$TMC_CLUSTER" = "" ]; then
   echo "Configure TMC_CLUSTER with the cluster name" >&2
   exit 1
 fi

src/local/use-gke.sh

@@ -1,13 +1,13 @@
-#!/usr/bin/env bash
+#!/bin/bash
 (return 0 2>/dev/null) && sourced=1 || sourced=0
-if [ "$sourced" == "0" ]; then
+if [ "$sourced" = "0" ]; then
   echo "This script must be invoked using: source $0 $*"
   exit 1
 fi
 function usage() {
     echo "Usage $0 <cluster> [namespace]"
 }
-if [ "$1" == "" ]; then
+if [ "$1" = "" ]; then
   usage
   return 1
 fi
@@ -21,12 +21,12 @@ export K8S_DRIVER=gke
 export GKE_CLUSTER="$1"
 echo "Connecting to $GKE_CLUSTER..."
 export REGION=$(gcloud container clusters list | grep -F "$CLUSTER_NAME" | awk '{print $2}')
-if [ "$REGION" == "" ]; then
+if [ "$REGION" = "" ]; then
   echo "Cannot find REGION from $CLUSTER_NAME"
   return 1
 fi
 print "\rConnecting to $GKE_CLUSTER at $REGION"
-gcloud container clusters get-credentials $GKE_CLUSTER --region $REGION > $HOME/.kube/config
-export KUBECONFIG=$HOME/.kube/config
-echo "KUBECONFIG set"
+export KUBECONFIG=$HOME/.kube/config-gke
+gcloud container clusters get-credentials $GKE_CLUSTER --region $REGION
+echo "KUBECONFIG set to $KUBECONFIG"
 echo "Namespace: $NS"

src/local/use-kind.sh

@@ -1,12 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
 (return 0 2>/dev/null) && sourced=1 || sourced=0
-if [ "$sourced" == "0" ]; then
+if [ "$sourced" = "0" ]; then
   echo "This script must be invoked using: source $0 $*"
   exit 1
 fi
 export K8S_DRIVER=kind
 export KUBECONFIG=
-if [ "$1" == "" ]; then
+if [ "$1" = "" ]; then
   export NS=default
 else
   export NS=$1

src/local/use-mk-docker.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 (return 0 2>/dev/null) && sourced=1 || sourced=0
 if ((sourced == 0)); then
   echo "This script must be invoked using: source $0 $*"