benchmark: enable prometheus to scrape metrics from (envoyproxy#3772)

guydc · Jul 16, 2024 · 6c5ee36 · 6c5ee36
1 parent ae93d1a
commit 6c5ee36
Show file tree

Hide file tree

Showing 17 changed files with 274 additions and 494 deletions.
diff --git a/test/benchmark/benchmark_test.go b/test/benchmark/benchmark_test.go
@@ -12,23 +12,13 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
-
 	"github.com/envoyproxy/gateway/test/benchmark/suite"
 	"github.com/envoyproxy/gateway/test/benchmark/tests"
+	kubetest "github.com/envoyproxy/gateway/test/utils/kubernetes"
 )
 
 func TestBenchmark(t *testing.T) {
-	cfg, err := config.GetConfig()
-	require.NoError(t, err)
-
-	cli, err := client.New(cfg, client.Options{})
-	require.NoError(t, err)
-
-	// Install all the scheme for kubernetes client.
-	suite.CheckInstallScheme(t, cli)
+	cli := kubetest.NewClient(t)
 
 	// Parse benchmark options.
 	flag.Parse()

diff --git a/test/benchmark/config/nighthawk-client.yaml b/test/benchmark/config/nighthawk-client.yaml
@@ -4,8 +4,6 @@ kind: Job
 metadata:
   name: "{NIGHTHAWK_CLIENT_NAME}"
   namespace: benchmark-test
-  labels:
-    benchmark-test/client: "true"
 spec:
   template:
     spec:

diff --git a/test/benchmark/suite/test.go → test/benchmark/suite/options.go b/test/benchmark/suite/test.go → test/benchmark/suite/options.go
@@ -8,14 +8,6 @@
 
 package suite
 
-import "testing"
-
-type BenchmarkTest struct {
-	ShortName   string
-	Description string
-	Test        func(*testing.T, *BenchmarkTestSuite) []*BenchmarkReport
-}
-
 // BenchmarkOptions for nighthawk-client.
 type BenchmarkOptions struct {
 	RPS         string