Change guest home directory to '/home/runner.guest'

Author: vsoch

.github/workflows/main.yaml

@@ -2,15 +2,16 @@
 name: Main
 on: [push, pull_request]
 jobs:
-  single-node:
-    name: "Single node"
-    strategy:
-      fail-fast: false
-      matrix:
-        container_engine: [docker, nerdctl, podman]
-    uses: ./.github/workflows/reusable-single-node.yaml
-    with:
-      container_engine: ${{ matrix.container_engine }}
+  # We would never use usernetes on a single node
+  #single-node:
+  #  name: "Single node"
+  #  strategy:
+  #    fail-fast: false
+  #    matrix:
+  #      container_engine: [docker, nerdctl, podman]
+  #  uses: ./.github/workflows/reusable-single-node.yaml
+  #  with:
+  #    container_engine: ${{ matrix.container_engine }}
 
   multi-node:
     name: "Multi node"
@@ -30,19 +31,3 @@ jobs:
     with:
       lima_template: ${{ matrix.lima_template }}
       container_engine: ${{ matrix.container_engine }}
-
-  # TODO: this test should create multiple instances of Usernetes on each of the hosts
-  multi-node-custom-ports:
-    name: "Multi node with custom service ports"
-    uses: ./.github/workflows/reusable-multi-node.yaml
-    with:
-      lima_template: "template://ubuntu-24.04"
-      container_engine: "docker"
-      # Defaults to 6443
-      kube_apiserver_port: "8080"
-      # Defaults to 8472
-      flannel_port: "9072"
-      # Defaults to 10250
-      kubelet_port: "20250"
-      # Defaults to 2379
-      etcd_port: "9090"

.github/workflows/reusable-single-node.yaml

@@ -83,9 +83,3 @@ jobs:
       - run: make kubeconfig
       - run: kubectl taint nodes --all node-role.kubernetes.io/control-plane-
       - run: ./hack/test-smoke.sh
-      - name: "Test data persistency after restarting the node"
-        run: |
-          make down
-          make up
-          sleep 30
-          ./hack/test-smoke.sh

Makefile

@@ -7,6 +7,8 @@ export PORT_KUBELET ?= 10250
 export PORT_FLANNEL ?= 8472
 export PORT_KUBE_APISERVER ?= 6443
 
+HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
 # HOSTNAME is the name of the physical host
 export HOSTNAME ?= $(shell hostname)
 # HOST_IP is the IP address of the physical host. Accessible from other hosts.
@@ -82,7 +84,7 @@ render: check-preflight
 .PHONY: up
 up: check-preflight
 	# Podman creates cni files in a shared location, this ensures unique names that do not clobbed one another
-	sed -i "s/default_network/$(HOSTNAME)/g" docker-compose.yaml
+	sed -i "s/default_network/$(HOSTNAME)/g" $(HERE)/docker-compose.yaml
 	$(COMPOSE) up --build -d
 
 .PHONY: down
@@ -145,7 +147,7 @@ sync-external-ip:
 .PHONY: kubeadm-join
 kubeadm-join:
 	# Our kernel is too old for usernetes, so we need this
-	sed -i "s/--token/--ignore-preflight-errors=all --token/g" join-command
+	sed -i "s/--token/--ignore-preflight-errors=all --token/g" $(HERE)/join-command
 	$(NODE_SHELL) /bin/bash /usernetes/join-command
 	@echo "# Run 'make sync-external-ip' on the control plane"
 

hack/create-cluster-lima.sh

@@ -11,7 +11,7 @@ set -eux -o pipefail
 : "${PORT_FLANNEL:=8472}"
 : "${PORT_KUBELET:=10250}"
 
-guest_home="/home/${USER}.linux"
+guest_home="/home/runner.guest"
 
 if [ "$(id -u)" -le 1000 ]; then
 	# In --plain mode, UID has to be >= 1000 to populate subuids
@@ -49,7 +49,8 @@ done
 ${LIMACTL} shell host0 ${SERVICE_PORTS} CONTAINER_ENGINE="${CONTAINER_ENGINE}" make -C "${guest_home}/usernetes" kubeadm-init install-flannel kubeconfig join-command
 
 # Let host1 join the cluster
-${LIMACTL} copy host0:~/usernetes/join-command host1:~/usernetes/join-command
+${LIMACTL} copy host0:${guest_home}/usernetes/join-command ./join-command
+${LIMACTL} copy ./join-command host1:${guest_home}/usernetes/join-command
 ${LIMACTL} shell host1 ${SERVICE_PORTS} CONTAINER_ENGINE="${CONTAINER_ENGINE}" make -C "${guest_home}/usernetes" kubeadm-join
 ${LIMACTL} shell host0 ${SERVICE_PORTS} CONTAINER_ENGINE="${CONTAINER_ENGINE}" make -C "${guest_home}/usernetes" sync-external-ip
 

hack/test-smoke.sh

@@ -56,16 +56,38 @@ EOF
 
 	INFO "GET PODS"
 	kubectl get pods
+	kubectl get pods -n kube-system
 	INFO "DESCRIBE PODS"
 	kubectl describe pods
 	for name in $(kubectl get pods -o json | jq -r .items[].metadata.name)
 	  do
 	     kubectl logs $name
+	     kubectl exec -it $name -- cat /etc/resolv.conf
 	  done
 
+	INFO "Patching CoreDNS to use 8.8.8.8"
+	kubectl get configmap coredns -n kube-system -o yaml | \
+	  sed 's/forward . \/etc\/resolv.conf/forward . 8.8.8.8/' | \
+	  kubectl apply -f -
+  
+	INFO "Restarting CoreDNS"
+	kubectl delete pod -n kube-system -l k8s-app=kube-dns
+	kubectl rollout status deployment coredns -n kube-system
+
 	INFO "Connecting to dnstest-{0,1,2}.dnstest.default.svc.cluster.local"
-	kubectl run -i --rm --image=alpine --restart=Never dnstest-shell -- sh -exc 'for f in $(seq 0 2); do wget -O- http://dnstest-${f}.dnstest.default.svc.cluster.local; done'
+	kubectl run -i --rm --image=busybox:1.28 --restart=Never dnstest-shell -- sh -exc '
+  echo "--- Resolv.conf ---"
+  cat /etc/resolv.conf
+  
+  echo "--- Testing External DNS (google.com) ---"
+  nslookup google.com || echo "External DNS Failed"
+
+  echo "--- Testing Internal DNS (dnstest-0) ---"
+  nslookup dnstest-0.dnstest || echo "Internal DNS Failed"
 
+  for f in 0 1 2; do 
+    wget -qO- http://dnstest-${f}.dnstest.default.svc.cluster.local
+  done'
 	INFO "Deleting Service \"dnstest\""
 	kubectl delete service dnstest
 	INFO "Deleting StatefulSet \"dnstest\""