Update go dependencies to metallb

and make e2etest use kubectl binary installed by Makefile Signed-off-by: karampok <[email protected]>
metallb · Jun 27, 2024 · ba9b0bd · ba9b0bd
1 parent cc46334
commit ba9b0bd
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -237,7 +237,7 @@ $(APIDOCSGEN): $(LOCALBIN)
 
 .PHONY: e2etests
 e2etests: ginkgo
-	$(GINKGO) -v $(GINKGO_ARGS) --timeout=3h ./e2etests -- $(TEST_ARGS)
+	$(GINKGO) -v $(GINKGO_ARGS) --timeout=3h ./e2etests -- --kubectl=$(KUBECTL) $(TEST_ARGS)
 
 
 .PHONY: kind-cluster

diff --git a/e2etests/e2etest_suite_test.go b/e2etests/e2etest_suite_test.go
@@ -14,6 +14,7 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	. "github.com/onsi/gomega"
+	"go.universe.tf/e2etest/pkg/executor"
 )
 
 var (
@@ -34,6 +35,7 @@ func handleFlags() {
 	flag.StringVar(&prometheusNamespace, "prometheus-namespace", "monitoring", "the namespace prometheus is running in (if running)")
 	flag.StringVar(&externalContainers, "external-containers", "", "a comma separated list of external containers names to use for the test. (valid parameters are: ibgp-single-hop / ibgp-multi-hop / ebgp-single-hop / ebgp-multi-hop)")
 	flag.StringVar(&frrImage, "frr-image", "quay.io/frrouting/frr:9.0.2", "the image to use for the external frr containers")
+	flag.StringVar(&executor.Kubectl, "kubectl", "kubectl", "the path for the kubectl binary")
 
 	flag.Parse()
 

diff --git a/e2etests/go.mod b/e2etests/go.mod
@@ -6,12 +6,12 @@ toolchain go1.22.4
 
 replace (
 	github.com/metallb/frr-k8s => ../
-	go.universe.tf/e2etest => github.com/metallb/metallb/e2etest v0.0.0-20240326160753-c8cc222a5831
-	go.universe.tf/metallb => github.com/metallb/metallb v0.14.4
+	go.universe.tf/e2etest => github.com/metallb/metallb/e2etest v0.0.0-20240619133525-62822a4a17e3
+	go.universe.tf/metallb => github.com/metallb/metallb v0.14.5
 )
 
 require (
-	github.com/metallb/frr-k8s v0.0.10
+	github.com/metallb/frr-k8s v0.0.11
 	github.com/onsi/ginkgo/v2 v2.17.2
 	github.com/onsi/gomega v1.33.1
 	github.com/openshift-kni/k8sreporter v1.0.4

diff --git a/e2etests/go.sum b/e2etests/go.sum
@@ -63,10 +63,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/metallb/metallb v0.14.4 h1:Yk7xYSUjIuxGwr8NAEYc4woeGLthI3sBsssz5Ytcz74=
-github.com/metallb/metallb v0.14.4/go.mod h1:lzyXkFXJhbtSQOI6M8jYTRznEUbq2X3k+OBtL2VKkmI=
-github.com/metallb/metallb/e2etest v0.0.0-20240326160753-c8cc222a5831 h1:6JXnAcu/DlXMWYhlqheaxv9ndkovaEDpLtK3cC6MiGE=
-github.com/metallb/metallb/e2etest v0.0.0-20240326160753-c8cc222a5831/go.mod h1:Ap5G83Zx1YGEf/gdy5U3o9iGnXAX6gk65aEVV+FlD/E=
+github.com/metallb/metallb v0.14.5 h1:2KHXaqoHWh924YTb5aJ9VRahXtO+V2DxvVrH5WQgsHI=
+github.com/metallb/metallb v0.14.5/go.mod h1:ZraHgX0iQnmWMK9CBpgs/5zXV0SkGjiXpPOxHKNO/9s=
+github.com/metallb/metallb/e2etest v0.0.0-20240619133525-62822a4a17e3 h1:ElpUr4tN1JMEUGBgEksAqjwck3fL5vCnrHCXz+Xu1O8=
+github.com/metallb/metallb/e2etest v0.0.0-20240619133525-62822a4a17e3/go.mod h1:YPFnmTIVs9MKgeIF5rEKPgDClyE3RDO+9suFgO1KmPQ=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -106,8 +106,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=