Merge remote-tracking branch 'origin' into issue/903/tns

.ciux

@@ -31,7 +31,7 @@ dependencies:
   - image: gitlab-registry.in2p3.fr/astrolabsoftware/fink/spark-py:k8s-3.4.1
     labels:
       build: "true"
-  - package: github.com/k8s-school/[email protected].3-rc9
+  - package: github.com/k8s-school/[email protected].4-rc1
     labels:
       itest: "optional"
   - package: github.com/astrolabsoftware/finkctl/[email protected]

doc/monitor.md

@@ -0,0 +1,16 @@
+# Monitor fink-broker platform
+
+```bash
+# Run the fink-ci script to install fink-broker from scratch
+fink-ci.sh -m -s -b <branch-name>
+
+# Port forward to grafana
+kubectl port-forward $(kubectl get  pods --selector=app.kubernetes.io/name=grafana -n  monitoring --output=jsonpath="{.items..metadata.name}") -n monitoring  3001:3000
+
+# Run ssh tunnel on workstation for remote access
+ssh fink_lpc -L 3001:localhost:3001 -N
+# Open URL below in a browser
+# login: admin
+# password: prom-operator
+curl http://localhost:3001
+```

e2e/fink-ci.sh

@@ -27,18 +27,19 @@ Available options:
   -s            Use the science algorithms during the tests
   -b <branch>   Branch name to clone (default: master)
 
-Clone Fink-broker source code in a tempory directory and run e2e test
-designed to be run as a cron job.
+Clone Fink-broker source code in a tempory directory and run e2e test.
+Designed to be run as a cron job.
 
 EOD
 }
 
 # Get the options
-while getopts hcsb: c ; do
+while getopts chmsb: c ; do
     case $c in
         h) usage ; exit 0 ;;
         b) branchname=$OPTARG ;;
         c) cleanup_opt="-c" ;;
+        m) monitoring_opt="-m" ;;
         s) science_opt="-s" ;;
         \?) usage ; exit 2 ;;
     esac
@@ -49,4 +50,4 @@ shift "$((OPTIND-1))"
 git clone --single-branch $repo_url $repo --branch $branchname
 
 # Run fink ci in science mode
-$repo/e2e/run.sh $cleanup_opt $science_opt
+$repo/e2e/run.sh $cleanup_opt $science_opt $monitoring_opt

e2e/prereq-install.sh

@@ -10,12 +10,14 @@ DIR=$(cd "$(dirname "$0")"; pwd -P)
 
 kind_version_opt=""
 cluster_name=$(ciux get clustername $DIR/..)
+monitoring=false
 
 # Get kind version from option -k
-while getopts k: flag
+while getopts mk: flag
 do
     case "${flag}" in
         k) kind_version_opt=--kind-version=${OPTARG};;
+        m) monitoring=true;;
     esac
 done
 
@@ -28,4 +30,8 @@ ink "Install OLM"
 ktbx install olm
 ink "Install ArgoCD operator"
 ktbx install argocd
+if [ "$monitoring" = true ]; then
+    ink "Install prometheus monitoring stack"
+    ktbx install prometheus
+fi
 

e2e/run.sh

@@ -9,9 +9,13 @@ set -euxo pipefail
 DIR=$(cd "$(dirname "$0")"; pwd -P)
 
 usage () {
-  echo "Usage: $0 [-s]"
+  echo "Usage: $0 [-c] [-h] [-m] [-s]"
   echo "  -s: Use the science algorithms during the tests"
   echo "  -c: Cleanup the cluster after the tests"
+  echo "  -m: Install monitoring stack"
+  echo "  -h: Display this help"
+  echo ""
+  echo " Run fink-broker e2e tests, using source code from the parent directory."
   exit 1
 }
 
@@ -24,19 +28,23 @@ src_dir=$DIR/..
 cleanup=false
 build=false
 e2e=false
+monitoring=false
 push=false
 
 token="${TOKEN:-}"
 
 # Get options for suffix
-while getopts hcs opt; do
+while getopts hcms opt; do
   case ${opt} in
     s )
       SUFFIX=""
       ;;
     c )
       cleanup=true
       ;;
+    m )
+      monitoring=true
+      ;;
     h )
       usage
       exit 0
@@ -105,7 +113,12 @@ echo "Delete the cluster $cluster if it already exists"
 ktbx delete --name "$cluster" || true
 
 echo "Create a Kubernetes cluster (Kind), Install OLM and ArgoCD operators."
-$DIR/prereq-install.sh
+monitoring_opt=""
+if [ $monitoring = true ]
+then
+  monitoring_opt="-m"
+fi
+$DIR/prereq-install.sh $monitoring_opt
 
 . $CIUXCONFIG
 if [ $CIUX_BUILD = true ]; then