From 59e2add5f1241a7d3f1f4f8cf09f1c48da18b83d Mon Sep 17 00:00:00 2001
From: Andrew Durbin <andrewd@zededa.com>
Date: Wed, 16 Oct 2024 11:39:17 -0600
Subject: [PATCH] Add hv:kubevirt platform:generic arch:amd64

Multus, cdi, longhorn support arm64 but k8s kubevirt does not have
release builds yet.

Minor logging improvement to make build run.

Signed-off-by: Andrew Durbin <andrewd@zededa.com>
---
 .github/workflows/build.yml         | 20 ++------------------
 .github/workflows/buildondemand.yml | 21 +++------------------
 pkg/pillar/kubeapi/kubeapi.go       |  6 +++---
 3 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1ddc64a22..1eb3a2c951 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -89,25 +89,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [arm64, amd64]
-        hv: [xen, kvm]
+        arch: [amd64]
+        hv: [kubevirt]
         platform: ["generic"]
-        include:
-          - arch: riscv64
-            hv: mini
-            platform: "generic"
-          - arch: amd64
-            hv: kvm
-            platform: "rt"
-          - arch: arm64
-            hv: kvm
-            platform: "nvidia"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_pollux"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_epc_r3720"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/buildondemand.yml b/.github/workflows/buildondemand.yml
index 2aef2b8235..49bf91df9b 100644
--- a/.github/workflows/buildondemand.yml
+++ b/.github/workflows/buildondemand.yml
@@ -87,25 +87,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [arm64, amd64]
-        hv: [xen, kvm]
+        arch: [amd64]
+        hv: [kubevirt]
         platform: ["generic"]
-        include:
-          - arch: riscv64
-            hv: mini
-            platform: "generic"
-          - arch: amd64
-            hv: kvm
-            platform: "rt"
-          - arch: arm64
-            hv: kvm
-            platform: "nvidia"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_pollux"
-          - arch: arm64
-            hv: kvm
-            platform: "imx8mp_epc_r3720"
+
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/pkg/pillar/kubeapi/kubeapi.go b/pkg/pillar/kubeapi/kubeapi.go
index d8d6a5d47a..23ff6754a3 100644
--- a/pkg/pillar/kubeapi/kubeapi.go
+++ b/pkg/pillar/kubeapi/kubeapi.go
@@ -206,18 +206,18 @@ func waitForLonghornReady(client *kubernetes.Clientset, hostname string) error {
 			LabelSelector: strings.Join(labelSelectors, ","),
 		})
 		if err != nil {
-			return fmt.Errorf("unable to get daemonset pods on node: %v", err)
+			return fmt.Errorf("unable to get daemonset pods on node:%s labels:%v err:%v ", hostname, labelSelectors, err)
 		}
 		if len(pods.Items) != 1 {
 			return fmt.Errorf("longhorn daemonset:%s missing on this node", lhDsName)
 		}
 		for _, pod := range pods.Items {
 			if pod.Status.Phase != "Running" {
-				return fmt.Errorf("daemonset:%s not running on node", lhDsName)
+				return fmt.Errorf("daemonset:%s phase:%s not running on node", lhDsName, pod.Status.Phase)
 			}
 			for _, podContainerState := range pod.Status.ContainerStatuses {
 				if !podContainerState.Ready {
-					return fmt.Errorf("daemonset:%s not ready on node", lhDsName)
+					return fmt.Errorf("daemonset:%s not ready on node due to pod:%s status:%v", lhDsName, pod.Name, podContainerState)
 				}
 			}
 		}