.github/workflows/pull-request.yaml: run on self-hosted

.github/workflows/pull-request.yaml

@@ -26,7 +26,7 @@ permissions:
 jobs:
   golangci-lint:
     name: golangci-lint
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
     steps:
       - name: setup-go
         uses: actions/setup-go@v3
@@ -42,7 +42,7 @@ jobs:
 
   test-kusk-cli:
     name: Compile and Test Kusk CLI
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -79,7 +79,7 @@ jobs:
 
   build-api-docker:
     name: Build API and websocket docker images
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
         with:
@@ -109,7 +109,7 @@ jobs:
 
   tests:
     name: tests
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
     steps:
       - name: setup-go
         uses: actions/setup-go@v3
@@ -128,8 +128,8 @@ jobs:
         uses: helm/kind-action@v1.5.0
         with:
           cluster_name: kgw
-          wait: 256s
-          verbosity: 1
+          wait: 1m
+          verbosity: 10
 
       - name: kubectl-get-services-all-namespaces-pre-loadbalancer-configuration
         run: |
@@ -163,7 +163,7 @@ jobs:
           echo 'installing `kusk-gateway-manager` (control-plane) image into cluster'
           make deploy
           kubectl get svc --all-namespaces
-          kubectl rollout status --namespace kusk-system deployment/kusk-gateway-manager --watch --timeout=256s
+          kubectl rollout status --namespace kusk-system deployment/kusk-gateway-manager --watch --timeout=1m
 
       - name: make-deploy-envoyfleet
         run: |

Makefile

@@ -141,7 +141,7 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests fmt vet install-deps ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) -p path)" go test $(shell go list ./... | grep -v smoketests | grep -v internal/controllers | grep -v api/v1alpha1) -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell setup-envtest use $(ENVTEST_K8S_VERSION) -p path)" go test -v -count=1 $(shell go list ./... | grep -v smoketests | grep -v internal/controllers | grep -v api/v1alpha1) -coverprofile cover.out
 
 .PHONY: testing
 testing: ## Run the integration tests from development/testing and then delete testing artifacts if succesfull.

cmd/kusk/Makefile

@@ -55,7 +55,7 @@ lint:
 
 .PHONY: test
 test:
-	go test -count=1 ./...
+	go test -v -count=1 ./...
 
 .PHONY: install-deps
 install-deps:

cmd/kusk/internal/overlays/overlays.go

@@ -15,7 +15,7 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-const imageName = "kubeshop/overlay-cli"
+const imageName = "docker.io/kubeshop/overlay-cli"
 
 type Overlay struct {
 	Overlays string   `json:"overlays,omitempty" yaml:"overlays,omitempty"`
@@ -61,22 +61,24 @@ func NewOverlay(path string) (o *Overlay, err error) {
 func (o *Overlay) Apply() (string, error) {
 	var err error
 	var overlayed string
+
 	if !IsUrl(o.Extends) {
 		overlayed, err = applyOverlay(o.path, o.Extends)
 		if err != nil {
-			return "", err
+			return "", fmt.Errorf(`Overlay.Apply failed - !IsUrl(o.Extends), o.path=%v, overlayed=%v: %w`, o.path, overlayed, err)
 		}
 	} else {
 		overlayed, err = applyOverlay(o.path, "")
 		if err != nil {
-			return "", err
+			return "", fmt.Errorf(`Overlay.Apply failed - IsUrl(o.Extends), o.path=%v, overlayed=%v: %w`, o.path, overlayed, err)
 		}
 	}
+
 	if f, err := os.CreateTemp("", "overlay"); err != nil {
-		return "", err
+		return "", fmt.Errorf(`Overlay.Apply failed - os.CreateTemp("", "overlay"), overlayed=%v: %w`, overlayed, err)
 	} else {
 		if _, err := f.Write([]byte(overlayed)); err != nil {
-			return "", err
+			return "", fmt.Errorf(`Overlay.Apply failed - f.Write([]byte(overlayed)), overlayed=%v: %w`, overlayed, err)
 		}
 		return f.Name(), err
 	}
@@ -126,12 +128,12 @@ func applyOverlay(path string, extends string) (string, error) {
 	ctx := context.Background()
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("unable to create new docker client from environment: %w", err)
 	}
 	defer cli.Close()
 	reader, err := cli.ImagePull(ctx, imageName, types.ImagePullOptions{})
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("unable to pull image %v: %w", imageName, err)
 	}
 
 	defer reader.Close()
@@ -157,10 +159,12 @@ func applyOverlay(path string, extends string) (string, error) {
 	} else {
 		cmd = exec.Command("docker", "run", "--rm", volumes, imageName)
 	}
+
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("cmd.CombinedOutput failed: cmd=%+#v, out=%v, %w", cmd, string(out), err)
 	}
+
 	return string(out), nil
 }
 

cmd/kusk/internal/overlays/overlays_test.go

@@ -2,23 +2,23 @@ package overlays
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestOverlayPass(t *testing.T) {
-	overlay, err := NewOverlay("overlay.yaml")
-	if err != nil {
-		t.Log(err)
-		t.Fail()
-	}
+	assert := assert.New(t)
+	overlay, err := NewOverlay("./overlay.yaml")
+	assert.NoError(err)
 
-	if _, err := overlay.Apply(); err != nil {
-		t.Log(err)
-		t.Fail()
-	}
+	appliedOverlay, err := overlay.Apply()
+	assert.NoError(err)
+	t.Logf("appliedOverlay=%v", appliedOverlay)
 }
 
 func TestOverlayNoPass(t *testing.T) {
-	if _, err := NewOverlay("overlayed.yaml"); err == nil {
-		t.Fail()
-	}
+	assert := assert.New(t)
+
+	_, err := NewOverlay("overlayed.yaml")
+	assert.Error(err)
 }