Add extra kubectl command that doesn't hide stdout

.gitlab-ci.yml

@@ -58,6 +58,9 @@ build sidecar rabbit init:
     # no need to build if another project triggered us
     - if: $CI_PIPELINE_SOURCE == "pipeline"
       when: never
+    # no need to build with tags or non-master...probably
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      when: never
     - changes:
         - sidecars/cspp-geo-rabbit-init/Dockerfile
         - sidecars/cspp-geo-rabbit-init/declare_exchange.py

helpers/deploy_rabbitmq.sh

@@ -31,7 +31,7 @@ helm upgrade -v 2 --install --kubeconfig $kubeconfig -f ${values_base}/values-ge
 # do a little waiting for the rabbitmq pod to be ready so future stages
 # don't fail to communicate with it
 echo "Start waiting for rabbitmq: $(date +%Y%m%dT%H%M%S)"
-kubectl wait -n $ns pod/geosphere-rabbit-rabbitmq-0 --timeout 120s --for=condition=Ready
+kubectl2 wait -n $ns pod/geosphere-rabbit-rabbitmq-0 --timeout 120s --for=condition=Ready
 status=$?
 echo "Done waiting for rabbitmq: $(date +%Y%m%dT%H%M%S) : $status"
 exit $status

helpers/shell_aliases.sh

@@ -11,3 +11,8 @@ kubectl() {
     docker run -a stdout --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl "$@"
 }
 export -f kubectl
+
+kubectl2() {
+    docker run --rm -v $(pwd):/apps -w /apps alpine/k8s:1.18.2 kubectl "$@"
+}
+export -f kubectl2