feat: improve network performance test to make it reusable and easily…

… modifiable

network/benchmarks/netperf/.gitignore

@@ -2,6 +2,7 @@ Dockerbuild/*
 Dockerbuildclient/*
 nptests
 netperf-w?.yaml
+result*/*.json
 *.csv
 *.jpg
 *.png
@@ -11,4 +12,6 @@ netperf-w?.yaml
 *.pyc
 .vscode
 data-*
-
+kubeConfig
+launch
+AzurePublicCloud-*.json

network/benchmarks/netperf/Makefile

@@ -14,18 +14,17 @@
 
 all: docker push launch runtests
 
-DOCKERREPO       := girishkalele/netperf-latest
+repo_owner := $(shell echo $(REPO_OWNER) | tr '[:upper:]' '[:lower:]')
+dockerrepo := $(if $(repo_owner),ghcr.io/$(repo_owner)/nptest,girishkalele/netperf-latest)
+image_tag := $(or $(IMAGE_TAG), latest)
 
-docker: launch
-	mkdir -p Dockerbuild/nptest && \
-	cp -f Dockerfile Dockerbuild/ && \
-    cp -f nptest/nptest.go Dockerbuild/nptest/ && \
-    cp -f go.mod Dockerbuild/ && \
-    cp -f go.sum Dockerbuild/ && \
-	docker build -t $(DOCKERREPO) Dockerbuild/
+docker: test
+	mkdir -p Dockerbuild && \
+	cp -rf nptest/* Dockerbuild/ && \
+	docker build -t $(dockerrepo):$(image_tag) Dockerbuild/
 
 push: docker
-	gcloud docker push $(DOCKERREPO)
+	docker push $(dockerrepo):$(image_tag)
 
 clean:
 	@rm -f Dockerbuild/*
@@ -36,6 +35,10 @@ clean:
 launch: launch.go
 	go build -o launch launch.go
 
+test:
+	go test ./...
+	cd nptest && go test ./...
+
 # 'runtests' is the test runner target
 runtests: launch
 	@echo Launching network performance tests
@@ -44,4 +47,6 @@ runtests: launch
 	cp netperf-latest.csv plotperf && cd plotperf; make plot && mv *png .. && mv *svg ..
 	@echo Results file netperf-latest.csv and SVG/PNG graphs generated successfully
 
+localtest: push
+	go run launch.go -image=$(dockerrepo):$(image_tag) -json -kubeConfig ./kubeConfig
 

network/benchmarks/netperf/go.mod

@@ -1,37 +1,47 @@
-module k8s.io/perf-tests/network
+module k8s.io/perf-tests/network/benchmarks/netperf
 
-go 1.22.4
+go 1.22.7
 
 require (
-	k8s.io/api v0.0.0-20181011064954-26c7a45db378
-	k8s.io/apimachinery v0.0.0-20181011064652-56cf97ad69c7
-	k8s.io/client-go v0.0.0-20181011105049-9b03088ac34f
+	k8s.io/api v0.30.3
+	k8s.io/apimachinery v0.30.3
+	k8s.io/client-go v0.30.3
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4 // indirect
-	github.com/gogo/protobuf v1.1.2-0.20181010092945-fd322a3c4963 // indirect
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/golang/protobuf v1.3.1 // indirect
-	github.com/google/btree v1.0.0 // indirect
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4 // indirect
-	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
-	github.com/json-iterator/go v1.1.6-0.20180914014843-2433035e5132 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/peterbourgon/diskv v2.0.2-0.20180312054125-0646ccaebea1+incompatible // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
-	github.com/stretchr/testify v1.5.1 // indirect
-	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
-	golang.org/x/net v0.0.0-20190603091049-60506f45cf65 // indirect
-	golang.org/x/oauth2 v0.0.0-20160902055913-3c3a985cb79f // indirect
-	golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a // indirect
-	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
-	google.golang.org/appengine v1.6.6 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.2.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
+	k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )