k8 deploy test (#40)

telackey · web-flow · commit 34db2980313e · 2025-05-01T20:15:05.000-05:00
diff --git a/.github/workflows/test-deploy-k8s.yml b/.github/workflows/test-deploy-k8s.yml
@@ -0,0 +1,29 @@
+name: K8S Deploy Test
+
+on:
+  pull_request:
+    branches: '*'
+  push:
+    branches: '*'
+
+jobs:
+  test:
+    name: "Run k8s deploy test suite"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: "Install Python"
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: "Print Python version"
+        run: python3 --version
+      - name: "Install shiv"
+        run: pip install shiv
+      - name: "Generate build version file"
+        run: ./scripts/create_build_tag_file.sh
+      - name: "Build local shiv package"
+        run: ./scripts/build_shiv_package.sh
+      - name: "Run k8s deploy tests"
+        run: ./tests/k8s-deploy/run-deploy-test.sh
diff --git a/src/stack/data/build_tag.txt b/src/stack/data/build_tag.txt
@@ -0,0 +1,2 @@
+# This file should be re-generated running: scripts/create_build_tag_file.sh script
+2.0.0-d531f73-202505011750
diff --git a/src/stack/deploy/deployment_create.py b/src/stack/deploy/deployment_create.py
@@ -281,14 +281,14 @@ def init_operation(  # noqa: C901
 ):
     default_spec_file_content = call_stack_deploy_init(deploy_command_context)
     spec_file_content = {"stack": stack, constants.deploy_to_key: deployer_type}
-    if deployer_type == "k8s":
+    if deployer_type in ["k8s", "k8s-kind"]:
         if kube_config:
             spec_file_content.update({constants.kube_config_key: kube_config})
-        else:
+        elif deployer_type == "k8s":
             error_exit("--kube-config must be supplied with --deploy-to k8s")
         if image_registry:
             spec_file_content.update({constants.image_registry_key: image_registry})
-        else:
+        elif deployer_type == "k8s":
             print("WARNING: --image-registry not specified, only default container registries (eg, Docker Hub) will be available")
         if k8s_http_proxy:
             proxy_hosts = {host for _, host, _, _ in map(_parse_http_proxy, k8s_http_proxy)}
@@ -343,7 +343,7 @@ def init_operation(  # noqa: C901
             spec_file_content.update({"config": merged_config})
 
     if not map_ports_to_host:
-        if deployer_type == "k8s":
+        if deployer_type in ["k8s", "k8s-kind"]:
             map_ports_to_host = "k8s-clusterip-same"
         elif deployer_type == "compose":
             map_ports_to_host = "any-variable-random"
@@ -364,6 +364,7 @@ def init_operation(  # noqa: C901
             matched = False
             for svc in ports:
                 for svc_port in ports[svc]:
+                    svc_port = svc_port.split(":")[-1].replace("/udp", "")
                     if f"{svc}:{svc_port}" == target:
                         matched = True
                         break
diff --git a/src/stack/deploy/k8s/cluster_info.py b/src/stack/deploy/k8s/cluster_info.py
@@ -178,10 +178,8 @@ def get_services(self):
             for service_name in services:
                 service_info = services[service_name]
                 if "ports" in service_info:
-                    svc_ports = [
-                        client.V1ServicePort(port=int(p), target_port=int(p), name=f"{service_name}-{p}")
-                        for p in service_info["ports"]
-                    ]
+                    int_ports = [int(p.split(":")[-1].replace("/udp", "")) for p in service_info["ports"]]
+                    svc_ports = [client.V1ServicePort(port=p, target_port=p, name=f"{service_name}-{p}") for p in int_ports]
                     service = client.V1Service(
                         metadata=client.V1ObjectMeta(
                             name=f"{self.app_name}-svc-{service_name}",
diff --git a/src/stack/deploy/k8s/helpers.py b/src/stack/deploy/k8s/helpers.py
@@ -24,10 +24,11 @@
 from ruamel.yaml.comments import CommentedSeq
 from typing import Set, Mapping, List
 
-from stack.util import get_k8s_dir, error_exit
-from stack.opts import opts
+from stack.build.build_util import container_exists_locally
 from stack.deploy.deploy_util import parsed_pod_files_map_from_file_names
 from stack.deploy.deployer import DeployerException
+from stack.opts import opts
+from stack.util import get_k8s_dir, error_exit
 
 
 DEFAULT_K8S_NAMESPACE = "default"
@@ -83,6 +84,10 @@ def install_ingress_for_kind():
 
 def load_images_into_kind(kind_cluster_name: str, image_set: Set[str]):
     for image in image_set:
+        if not container_exists_locally(image):
+            result = _shell_command(f"docker pull {image}")
+            if result.returncode != 0:
+                raise DeployerException(f"kind create cluster failed: {result}")
         result = _shell_command(f"kind load docker-image {image} --name {kind_cluster_name}")
         if result.returncode != 0:
             raise DeployerException(f"kind create cluster failed: {result}")
diff --git a/tests/deploy/run-deploy-test.sh b/tests/deploy/run-deploy-test.sh
@@ -9,26 +9,73 @@ env
 
 delete_cluster_exit () {
     $TEST_TARGET_SO manage --dir $test_deployment_dir stop --delete-volumes
-    exit 1
 }
 
+trap delete_cluster_exit EXIT
+
+add_todo() {
+  set +e
+
+  local running=0
+  local check=0
+  local check_limit=10
+
+  url=$1
+  title=$2
+
+  try=0
+  rc=1
+
+  while [ $rc -ne 0 ] && [ $try -lt 10 ]; do
+    try=$((try + 1))
+    curl "$url" \
+      --fail-with-body \
+      -H 'Accept: application/json, text/plain, */*' \
+      -H 'Accept-Language: en-US,en;q=0.9' \
+      -H 'Connection: keep-alive' \
+      -H 'Content-Type: application/json' \
+      -H 'Origin: http://localhost' \
+      -H 'Referer: http://localhost/' \
+      -H 'Sec-Fetch-Dest: empty' \
+      -H 'Sec-Fetch-Mode: cors' \
+      -H 'Sec-Fetch-Site: same-site' \
+      -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0' \
+      -H 'sec-ch-ua: "Microsoft Edge";v="135", "Not-A.Brand";v="8", "Chromium";v="135"' \
+      -H 'sec-ch-ua-mobile: ?0' \
+      -H 'sec-ch-ua-platform: "Windows"' \
+      --data-raw "{\"title\":\"$title\",\"completed\":false}"
+    rc=$?
+
+    if [ $rc -ne 0 ]; then
+      echo "Error adding todo, retrying..."
+      sleep 5
+    fi
+  done
+
+  set -e
+
+  return $rc
+}
+
+
 wait_for_running () {
   # Check that all services are running
+  local how_many=$1
   local running=0
   local check=0
   local check_limit=10
-  while [ $running -lt 3 ] && [ $check -lt $check_limit ]; do
+  while [ $running -lt $how_many ] && [ $check -lt $check_limit ]; do
       check=$((check + 1))
-      running=$($TEST_TARGET_SO manage --dir $test_deployment_dir status | grep -c "running")
-      if [ $running -lt 3 ]; then
+      running=$($TEST_TARGET_SO manage --dir $test_deployment_dir status | grep -ic "running")
+      if [ $running -lt $how_many ]; then
           echo "deploy manage start: Waiting for services to start..."
           sleep 5
       fi
   done
 
-  if [ $running -lt 3 ]; then
+  if [ $running -lt $how_many ]; then
       echo "deploy manage start: failed - not all services started"
-      delete_cluster_exit
+      exit 1
   fi
 }
 
@@ -79,34 +126,16 @@ echo "deploy create test: passed"
 
 # Start
 $TEST_TARGET_SO manage --dir $test_deployment_dir start
-wait_for_running
+wait_for_running 3
 
 # Add a todo
 todo_title="79b06705-b402-431a-83a3-a634392d2754"
-curl 'http://localhost:5000/api/todos' \
-  -H 'Accept: application/json, text/plain, */*' \
-  -H 'Accept-Language: en-US,en;q=0.9' \
-  -H 'Connection: keep-alive' \
-  -H 'Content-Type: application/json' \
-  -H 'Origin: http://localhost:3000' \
-  -H 'Referer: http://localhost:3000/' \
-  -H 'Sec-Fetch-Dest: empty' \
-  -H 'Sec-Fetch-Mode: cors' \
-  -H 'Sec-Fetch-Site: same-site' \
-  -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36 Edg/135.0.0.0' \
-  -H 'sec-ch-ua: "Microsoft Edge";v="135", "Not-A.Brand";v="8", "Chromium";v="135"' \
-  -H 'sec-ch-ua-mobile: ?0' \
-  -H 'sec-ch-ua-platform: "Windows"' \
-  --data-raw "{\"title\":\"$todo_title\",\"completed\":false}"
-if [ $? -ne 0 ]; then
-    echo "deploy storage: failed - todo $todo_title not added"
-    delete_cluster_exit
-fi
+add_todo http://localhost:5000/api/todos "$todo_title"
 
 # Check that it exists
 if [ "$todo_title" != "$(curl -s http://localhost:5000/api/todos | jq -r '.[] | select(.id == 1) | .title')" ]; then
     echo "deploy storage: failed - todo $todo_title not found"
-    delete_cluster_exit
+    exit 1
 fi
 
 # Stop the stack (don't delete volumes)
@@ -116,18 +145,19 @@ $TEST_TARGET_SO manage --dir $test_deployment_dir stop
 $TEST_TARGET_SO manage --dir $test_deployment_dir start
 
 # Check that all services are running
-wait_for_running
+wait_for_running 3
 
 # Check that it is still viewable
 if [ "$todo_title" != "$(curl -s http://localhost:5000/api/todos | jq -r '.[] | select(.id == 1) | .title')" ]; then
     echo "deploy storage: failed - todo $todo_title not found after restart"
-    delete_cluster_exit
+    exit 1
 fi
 echo "deploy storage: passed"
 
 # TODO: Do we need to add a check for deleting the volumes?
 #  Docker doesn't remove the files for a bound volume so nothing much really changes.
 
-# Stop and clean up
-$TEST_TARGET_SO manage --dir $test_deployment_dir stop --delete-volumes
+wget -q -O - http://localhost:3000 | grep 'bundle.js'
+echo "deploy http: passed"
+
 echo "Test passed"
diff --git a/tests/k8s-deploy/run-deploy-test.sh b/tests/k8s-deploy/run-deploy-test.sh

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# This file should be re-generated running: scripts/create_build_tag_file.sh script`
	`2`	`+2.0.0-d531f73-202505011750`