init e2e setup kind cluster

Signed-off-by: ii2day <[email protected]>

.github/workflows/auto-pr-ci.yaml

@@ -229,6 +229,7 @@ jobs:
     with:
       ref: ${{ needs.prepare.outputs.ref }}
       ipfamily: dual
+      install_cilium: true
       e2e_labels: ${{ needs.prepare.outputs.e2e_labels }}
       kind_node_image: ${{ needs.prepare.outputs.kindNodeImage }}
     secrets: inherit
@@ -240,6 +241,7 @@ jobs:
     with:
       ref: ${{ needs.prepare.outputs.ref }}
       ipfamily: ipv4
+      install_cilium: true
       e2e_labels: ${{ needs.prepare.outputs.e2e_labels }}
       kind_node_image: ${{ needs.prepare.outputs.kindNodeImage }}
     secrets: inherit
@@ -251,6 +253,7 @@ jobs:
     with:
       ref: ${{ needs.prepare.outputs.ref }}
       ipfamily: ipv6
+      install_cilium: true
       e2e_labels: ${{ needs.prepare.outputs.e2e_labels }}
       kind_node_image: ${{ needs.prepare.outputs.kindNodeImage }}
     secrets: inherit

.github/workflows/call-e2e.yaml

@@ -25,6 +25,9 @@ on:
       kind_node_image:
         required: false
         type: string
+      install_cilium:
+        required: false
+        type: string
 
 jobs:
   e2e_against_commit:
@@ -115,9 +118,9 @@ jobs:
           max_attempts: 3
           shell: bash
           command: |
-            make e2e_init -e E2E_KIND_CLUSTER_NAME=${{ env.RUN_KIND_CLUSTER_NAME }} \
-                -e PROJECT_IMAGE_VERSION=${{ inputs.ref }} \
+            make e2e_init -e PROJECT_IMAGE_VERSION=${{ inputs.ref }} \
                 -e E2E_IP_FAMILY=${{ inputs.ipfamily }} \
+                -e INSTALL_CILIUM=${{ inputs.install_cilium }} \
                 -e PYROSCOPE_LOCAL_PORT='' \
                 -e E2E_KIND_NODE_IMAGE=${{ inputs.kind_node_image }}
 

.github/yamllint-conf.yml

@@ -11,7 +11,7 @@ yaml-files:
 ignore: |
   vendor/
   .github/
-  test/yaml/
+  test/yamls/
   charts/
 
 rules:

.gitignore

@@ -38,7 +38,7 @@ unitestreport.json
 e2ereport.json
 
 .DS_Store
-
+.idea/
 .vscode/
 *.plist
 

Makefile

@@ -353,19 +353,16 @@ unitest_tests:
 
 .PHONY: e2e
 e2e:
-	make -C test check_images_ready
 	make -C test e2e
 
 .PHONY: e2e_init
 e2e_init:
-	make -C test check_images_ready
-	make -C test init_kind_env
-	make -C test deploy_project
-	make -C test install_example_app
+	make -C test kind-init
+
 
 .PHONY: e2e_run
 e2e_run:
-	make -C test e2e_test
+	echo "skip run e2e"
 
 .PHONY: e2e_clean
 e2e_clean:

Makefile.defs

@@ -4,8 +4,6 @@ GO_VERSION := 1.21.7
 REGISTER ?= ghcr.io
 GIT_REPO ?= koffloader-io/koffloader
 
-
-
 #======================
 
 SHELL := /bin/bash
@@ -18,10 +16,14 @@ INSTALL = install
 
 PREFIX?=/usr
 BINDIR?=$(PREFIX)/bin
-TARGETARCH ?= amd64
 
-DESTDIR_BIN ?= $(ROOT_DIR)/output/$(TARGETARCH)/bin
-DESTDIR_BASH_COMPLETION ?= $(ROOT_DIR)/output/$(TARGETARCH)/bash-completion
+ARCH = $(shell uname -m)
+ifeq ($(ARCH),x86_64)
+    ARCH=amd64
+endif
+
+DESTDIR_BIN ?= $(ROOT_DIR)/output/$(ARCH)/bin
+DESTDIR_BASH_COMPLETION ?= $(ROOT_DIR)/output/$(ARCH)/bash-completion
 
 CHART_DIR := $(ROOT_DIR)/charts
 DESTDIR_CHART ?= $(ROOT_DIR)/output/chart

pkg/lock/lock_debug_test.go

@@ -8,6 +8,7 @@ package lock_test
 
 import (
 	. "github.com/onsi/ginkgo/v2"
+
 	"github.com/koffloader-io/koffloader/pkg/lock"
 )
 

pkg/lock/lock_fast_test.go

@@ -7,9 +7,11 @@
 package lock_test
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo/v2"
+
 	"github.com/koffloader-io/koffloader/pkg/lock"
-	"time"
 )
 
 var _ = Describe("LockFast", Label("unitest"), func() {

pkg/utils/cert.go

@@ -11,15 +11,17 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"github.com/koffloader-io/koffloader/pkg/types"
-	"github.com/pkg/errors"
-	"k8s.io/client-go/util/cert"
-	"k8s.io/client-go/util/keyutil"
-	netutils "k8s.io/utils/net"
 	"math/big"
 	"net"
 	"os"
 	"time"
+
+	"github.com/pkg/errors"
+	"k8s.io/client-go/util/cert"
+	"k8s.io/client-go/util/keyutil"
+	netutils "k8s.io/utils/net"
+
+	"github.com/koffloader-io/koffloader/pkg/types"
 )
 
 const (

pkg/utils/net.go

@@ -5,9 +5,10 @@ package utils
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"net"
 	"strings"
+
+	"github.com/pkg/errors"
 )
 
 func ListHostAllInterfaces() ([]string, error) {

pkg/utils/net_test.go

@@ -5,10 +5,12 @@ package utils_test
 
 import (
 	"fmt"
+	"net"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/koffloader-io/koffloader/pkg/utils"
-	"net"
 )
 
 var _ = Describe("net", func() {