Skip to content

Commit aa02653

Browse files
ritwikranjanritwikranjan
committedSep 13, 2024
Add network/nptest module and update dependencies
1 parent 5fad5f7 commit aa02653

File tree

8 files changed

+506
-189
lines changed

8 files changed

+506
-189
lines changed
 

‎network/benchmarks/netperf/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Dockerbuild/*
22
Dockerbuildclient/*
33
nptests
44
netperf-w?.yaml
5+
*.json
56
*.csv
67
*.jpg
78
*.png
@@ -11,4 +12,6 @@ netperf-w?.yaml
1112
*.pyc
1213
.vscode
1314
data-*
15+
kubeConfig
16+
launch
1417

‎network/benchmarks/netperf/Dockerfile

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,17 @@
2121
#
2222
# Args: --mode=worker --host=<service cluster ip> --port=5202
2323
#
24-
ARG GOLANG_VERSION=1.18
25-
FROM golang:${GOLANG_VERSION} as builder
24+
FROM golang:bullseye AS builder
2625
WORKDIR /workspace
2726

28-
COPY nptest/nptest.go nptest.go
29-
COPY go.sum go.sum
27+
COPY nptest.go nptest.go
3028
COPY go.mod go.mod
3129

3230
RUN go build -o nptests
3331

3432
FROM debian:bullseye
3533
ENV LD_LIBRARY_PATH=/usr/local/lib
3634

37-
MAINTAINER Girish Kalele <gkalele@google.com>
3835
# install binary and remove cache
3936
RUN apt-get update \
4037
&& apt-get install -y curl wget net-tools gcc make libsctp-dev git autotools-dev automake \

‎network/benchmarks/netperf/Makefile

+8-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@
1414

1515
all: docker push launch runtests
1616

17-
DOCKERREPO := girishkalele/netperf-latest
17+
DOCKERREPO := $(or $(DOCKERREPO), girishkalele/netperf-latest)
1818

1919
docker: launch
20-
mkdir -p Dockerbuild/nptest && \
20+
mkdir -p Dockerbuild && \
2121
cp -f Dockerfile Dockerbuild/ && \
22-
cp -f nptest/nptest.go Dockerbuild/nptest/ && \
23-
cp -f go.mod Dockerbuild/ && \
24-
cp -f go.sum Dockerbuild/ && \
22+
cp -f nptest/nptest.go Dockerbuild/ && \
23+
cp -f nptest/go.mod Dockerbuild/ && \
2524
docker build -t $(DOCKERREPO) Dockerbuild/
2625

2726
push: docker
@@ -44,4 +43,8 @@ runtests: launch
4443
cp netperf-latest.csv plotperf && cd plotperf; make plot && mv *png .. && mv *svg ..
4544
@echo Results file netperf-latest.csv and SVG/PNG graphs generated successfully
4645

46+
localtest: docker
47+
docker push $(DOCKERREPO)
48+
go run launch.go -image=$(DOCKERREPO) -json -kubeConfig ./kubeConfig
49+
4750

‎network/benchmarks/netperf/go.mod

+39-26
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,50 @@
11
module k8s.io/perf-tests/network
22

3-
go 1.22.4
3+
go 1.23
44

55
require (
6-
k8s.io/api v0.0.0-20181011064954-26c7a45db378
7-
k8s.io/apimachinery v0.0.0-20181011064652-56cf97ad69c7
8-
k8s.io/client-go v0.0.0-20181011105049-9b03088ac34f
6+
k8s.io/api v0.31.0
7+
k8s.io/apimachinery v0.31.0
8+
k8s.io/client-go v0.31.0
99
)
1010

1111
require (
12-
github.com/davecgh/go-spew v1.1.1 // indirect
13-
github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4 // indirect
14-
github.com/gogo/protobuf v1.1.2-0.20181010092945-fd322a3c4963 // indirect
15-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
16-
github.com/golang/protobuf v1.3.1 // indirect
17-
github.com/google/btree v1.0.0 // indirect
18-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
19-
github.com/googleapis/gnostic v0.2.3-0.20180520015035-48a0ecefe2e4 // indirect
20-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
12+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
13+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
14+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
15+
github.com/go-logr/logr v1.4.2 // indirect
16+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
17+
github.com/go-openapi/jsonreference v0.20.2 // indirect
18+
github.com/go-openapi/swag v0.22.4 // indirect
19+
github.com/gogo/protobuf v1.3.2 // indirect
20+
github.com/golang/protobuf v1.5.4 // indirect
21+
github.com/google/gnostic-models v0.6.8 // indirect
22+
github.com/google/go-cmp v0.6.0 // indirect
23+
github.com/google/gofuzz v1.2.0 // indirect
24+
github.com/google/uuid v1.6.0 // indirect
2125
github.com/imdario/mergo v0.3.6 // indirect
22-
github.com/json-iterator/go v1.1.6-0.20180914014843-2433035e5132 // indirect
26+
github.com/josharian/intern v1.0.0 // indirect
27+
github.com/json-iterator/go v1.1.12 // indirect
28+
github.com/mailru/easyjson v0.7.7 // indirect
2329
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
24-
github.com/modern-go/reflect2 v1.0.1 // indirect
25-
github.com/peterbourgon/diskv v2.0.2-0.20180312054125-0646ccaebea1+incompatible // indirect
26-
github.com/spf13/pflag v1.0.3 // indirect
27-
github.com/stretchr/testify v1.5.1 // indirect
28-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
29-
golang.org/x/net v0.0.0-20190603091049-60506f45cf65 // indirect
30-
golang.org/x/oauth2 v0.0.0-20160902055913-3c3a985cb79f // indirect
31-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a // indirect
32-
golang.org/x/text v0.3.2 // indirect
33-
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
34-
google.golang.org/appengine v1.6.6 // indirect
30+
github.com/modern-go/reflect2 v1.0.2 // indirect
31+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
32+
github.com/spf13/pflag v1.0.5 // indirect
33+
github.com/x448/float16 v0.8.4 // indirect
34+
golang.org/x/net v0.26.0 // indirect
35+
golang.org/x/oauth2 v0.21.0 // indirect
36+
golang.org/x/sys v0.21.0 // indirect
37+
golang.org/x/term v0.21.0 // indirect
38+
golang.org/x/text v0.16.0 // indirect
39+
golang.org/x/time v0.3.0 // indirect
40+
google.golang.org/protobuf v1.34.2 // indirect
3541
gopkg.in/inf.v0 v0.9.1 // indirect
36-
gopkg.in/yaml.v2 v2.2.2 // indirect
42+
gopkg.in/yaml.v2 v2.4.0 // indirect
43+
gopkg.in/yaml.v3 v3.0.1 // indirect
44+
k8s.io/klog/v2 v2.130.1 // indirect
45+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
46+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
47+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
48+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
49+
sigs.k8s.io/yaml v1.4.0 // indirect
3750
)

0 commit comments

Comments
 (0)