Reuse the automated test setup for y-cluster-provision-k3s-docker

Author: solsson

bin/y-cluster-provision-k3s-docker

@@ -4,27 +4,24 @@ set -e
 
 [ -z "$KUBECONFIG" ] && echo "Provision requires an explicit KUBECONFIG env" && exit 1
 
-COMPOSE="docker-compose -p ystack -f docker-compose.test.yml"
-[ -z "$NODES" ] && NODES=2
-# TODO condition to toggle dev/qa mode
-false || {
-  COMPOSE="$COMPOSE -f docker-compose.dev-overrides.yml"
-  # ATM with port-forward we only support one node
-  [ $NODES -eq 1 ] || echo "# Dev mode only supports one node, util we add some kind of load balancer container"
-  NODES=1
-}
-
-(cd $YSTACK_HOME/ && \
-  $COMPOSE up --scale node=$NODES -d --build && \
-  docker ps && \
-  echo "# Compose commmand:" && echo "$COMPOSE" && \
-  echo "# To tear down:" && echo "$COMPOSE down --remove-orphans -v" && \
-  echo "# Currently, because sut doesn't wait for server to be up, you need another:" && echo "$COMPOSE up -d" && \
-  true )
-
-$COMPOSE exec server sh -c 'until test -f /admin/.kube/kubeconfig.yaml; do echo "# Waiting ..." && sleep 1; done; cat /admin/.kube/kubeconfig.yaml' \
+[ -z "$CONTEXTNAME" ] && CONTEXTNAME=local
+
+COMPOSE=y-docker-compose
+$COMPOSE up --build -d ystack-proxy
+
+echo "# Compose command:"
+echo "$COMPOSE"
+echo "# To tear down:"
+echo "$COMPOSE down --remove-orphans -v"
+
+$COMPOSE exec master1 sh -c 'until test -f /admin/.kube/kubeconfig.yaml; do sleep 1; done; cat /admin/.kube/kubeconfig.yaml' \
   > "$KUBECONFIG.tmp"
 
-KUBECONFIG="$KUBECONFIG.tmp" kubectl config rename-context default local
+KUBECONFIG="$KUBECONFIG.tmp" kubectl config rename-context default $CONTEXTNAME
 
 y-kubeconfig-import "$KUBECONFIG.tmp"
+
+YSTACK_SUT_KEEP_RUNNING=false y-docker-compose up --build sut
+
+# specs currently don't clean up after themselves
+kubectl --context=$CONTEXTNAME -n ystack-specs scale --replicas=0 deploy --all

bin/y-cluster-provision-k3s-multipass

@@ -4,6 +4,8 @@ set -e
 
 [ -z "$KUBECONFIG" ] && echo "Provision requires an explicit KUBECONFIG env" && exit 1
 
+[ -z "$CONTEXTNAME" ] && CONTEXTNAME=local
+
 [ -z "$VM_NAME" ] && VM_NAME="ystack-master"
 [ -z "$VM_RESOURCES" ] && VM_RESOURCES="-m 8G -d 40G -c 4"
 
@@ -24,7 +26,7 @@ multipass exec "$VM_NAME" -- sudo cat /etc/rancher/k3s/k3s.yaml \
   | sed "s|127.0.0.1|$K3S_NODEIP_MASTER|" \
   > "$KUBECONFIG.tmp"
 
-KUBECONFIG="$KUBECONFIG.tmp" kubectl config rename-context default local
+KUBECONFIG="$KUBECONFIG.tmp" kubectl config rename-context default $CONTEXTNAME
 
 KUBECONFIG="$KUBECONFIG.tmp" kubectl --context=local create namespace ystack
 

bin/y-docker-compose

@@ -8,19 +8,22 @@ COMPOSEFILES="-f $YSTACK_HOME/docker-compose.test.yml -f $YSTACK_HOME/docker-com
 
 KUBECONFIG=$YSTACK_HOME/devcluster/.kube/kubeconfig.yaml
 
-[ "$1" = "kubeconfig-path" ] && \
+if [ "$1" = "kubeconfig-path" ]; then
   echo "$KUBECONFIG" && \
   exit 0
+fi
 
-[ "$1" = "kubie" ] && \
-  y-kubie ctx -f $KUBECONFIG && \
+if [ "$1" = "kubie" ]; then
+  y-kubie ctx -f $KUBECONFIG
   exit 0
+fi
 
 docker-compose $COMPOSEFILES "$@"
 
-[ "$1" = "down" ] && \
-  echo "Removing local config" && \
-  (docker-compose $COMPOSEFILES up cleanup) && \
-  echo "Cleaning up volumes" && \
-  (docker volume rm ystack_admin ystack_k3s-server 2>/dev/null || true) && \
+if [ "$1" = "down" ]; then
+  echo "Removing local config"
+  (docker-compose $COMPOSEFILES up cleanup)
+  echo "Cleaning up volumes"
+  (docker volume rm ystack_admin ystack_k3s-server 2>/dev/null || true)
   echo "Done"
+fi

docker-compose.dev-overrides.yml

@@ -20,7 +20,8 @@ services:
 
   sut:
     environment:
-    - KEEP_RUNNING=true
+    - KEEP_RUNNING=${YSTACK_SUT_KEEP_RUNNING-true}
+    - EXAMPLES=${YSTACK_SUT_EXAMPLES-}
 
 volumes:
   admin:

hooks/post_push

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+echo "post_push listing env"
+printenv
+
+echo "post_push listing images"
+docker images