Sync #581

.github/workflows/test-k3d.yml

@@ -24,10 +24,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
-      - name: "Install K3d and deploy a cluster"
+      - name: "Use K3D"
         run: |
           wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
-          k3d cluster create 
+          k3d cluster create
 
       - name: "Build CLI binary & init-packages"
         run: make build-cli-linux-amd init-package build-examples ARCH=amd64

.github/workflows/test-kind.yml

@@ -14,9 +14,6 @@ jobs:
       - name: "Checkout Repo"
         uses: actions/checkout@v3
 
-      - name: "Create k8s Kind Cluster"
-        uses: helm/[email protected]
-
       - name: "Setup caching"
         uses: actions/cache@v3
         with:
@@ -27,6 +24,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
 
+      - name: "Use KIND"
+        run: |
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-amd64
+          chmod +x ./kind        
+          ./kind create cluster
+
       - name: "Build CLI binary & init-packages"
         run: make build-cli-linux-amd init-package build-examples ARCH=amd64
 

src/test/e2e/common.go

@@ -45,8 +45,7 @@ func getCLIName() string {
 // setup actions for each test
 func (e2e *ZarfE2ETest) setup(t *testing.T) {
 	t.Log("Test setup")
-
-	// utils.ExecCommandWithContext(context.TODO(), true, "kubectl")
+	utils.ExecCommandWithContext(context.TODO(), true, "sh", "-c", "kubectl describe nodes |grep -A 99 Non\\-terminated")
 }
 
 // teardown actions for each test
@@ -66,7 +65,7 @@ func (e2e *ZarfE2ETest) teardown(t *testing.T) {
 		helm.RemoveChart(chart.namespace, chart.name, spinner)
 	}
 	spinner.Success()
-	
+
 	e2e.cmdsToKill = []*exec.Cmd{}
 	e2e.chartsToRemove = []ChartTarget{}
 }