Skip to content

Commit c1f34f3

Browse files
ldemaillyistio-testing
ldemailly
authored and
istio-testing
committed
update fortio to new version and location (istio#8297)
* update fortio to new location * using latest fortio tag, but not sure what "testApply" does anyway * assuming this is what testApply changes * ran bin/fmt.sh as instructed by failing linter build * use makefile target to build fortio from source with version embedded
1 parent 7f3029b commit c1f34f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+367
-455
lines changed

‎Gopkg.lock

+22-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ required = [
2929
"github.com/istio/tools/protoc-gen-docs",
3030
### END Mixer codegen deps
3131
# fortio is built in vendor for the testing framework
32-
"istio.io/fortio",
32+
"fortio.org/fortio",
3333
]
3434

3535
ignored = [
@@ -334,7 +334,7 @@ ignored = [
334334
unused-packages = true
335335
non-go = true
336336
[[prune.project]]
337-
name = "istio.io/fortio"
337+
name = "fortio.org/fortio"
338338
non-go = false
339339
unused-packages = false
340340
[[prune.project]]
@@ -368,3 +368,4 @@ ignored = [
368368
[[override]]
369369
name = "github.com/imdario/mergo"
370370
revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"
371+

‎mixer/test/client/env/http_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525
"time"
2626

27-
"istio.io/fortio/fhttp"
27+
"fortio.org/fortio/fhttp"
2828
)
2929

3030
const (

‎samples/httpbin/sample-client/fortio-deploy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
spec:
1212
containers:
1313
- name: fortio
14-
image: istio/fortio:latest_release
14+
image: fortio/fortio:latest_release
1515
imagePullPolicy: Always
1616
ports:
1717
- containerPort: 8080

‎samples/rawvm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FORTIO_IMAGE:='istio/fortio:latest'
2+
FORTIO_IMAGE:='fortio/fortio:latest'
33
VERBOSITY:=2
44
NAMESPACE:=fortio
55

‎tests/e2e/tests/dashboard/dashboard_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ import (
3131
"github.com/prometheus/client_golang/api/prometheus/v1"
3232
"github.com/prometheus/common/model"
3333

34-
"istio.io/fortio/fhttp"
35-
"istio.io/fortio/periodic"
34+
"fortio.org/fortio/fhttp"
35+
"fortio.org/fortio/periodic"
36+
3637
"istio.io/istio/pkg/log"
3738
"istio.io/istio/tests/e2e/framework"
3839
"istio.io/istio/tests/util"
@@ -314,7 +315,7 @@ func setTestConfig() error {
314315
tag := os.Getenv("FORTIO_TAG")
315316
image := hub + "/fortio:" + tag
316317
if hub == "" || tag == "" {
317-
image = "istio/fortio:latest" // TODO: change
318+
image = "fortio/fortio:latest" // TODO: change
318319
}
319320
log.Infof("Fortio hub %s tag %s -> image %s", hub, tag, image)
320321
services := []framework.App{

‎tests/e2e/tests/mixer/mixer_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ import (
3535
"github.com/prometheus/client_golang/api/prometheus/v1"
3636
"github.com/prometheus/common/model"
3737

38-
"istio.io/fortio/fhttp"
38+
"fortio.org/fortio/fhttp"
39+
40+
// flog "fortio.org/fortio/log"
41+
"fortio.org/fortio/periodic"
3942

40-
// flog "istio.io/fortio/log"
41-
"istio.io/fortio/periodic"
4243
"istio.io/istio/pkg/log"
4344
"istio.io/istio/tests/e2e/framework"
4445
"istio.io/istio/tests/util"

‎tests/e2e/tests/simple/a_simple_1_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ import (
3434
"testing"
3535
"time"
3636

37-
"istio.io/fortio/fhttp"
38-
"istio.io/fortio/periodic"
37+
"fortio.org/fortio/fhttp"
38+
"fortio.org/fortio/periodic"
39+
3940
"istio.io/istio/pkg/log"
4041
"istio.io/istio/tests/e2e/framework"
4142
"istio.io/istio/tests/util"
@@ -357,7 +358,7 @@ func setTestConfig() error {
357358
tag := os.Getenv("FORTIO_TAG")
358359
image := hub + "/fortio:" + tag
359360
if hub == "" || tag == "" {
360-
image = "istio/fortio:latest_release"
361+
image = "fortio/fortio:latest_release"
361362
}
362363
log.Infof("Fortio hub %s tag %s -> image %s", hub, tag, image)
363364
services := []framework.App{

‎tests/helm/setup.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function testInstall() {
3030

3131
# Apply the helm template
3232
function testApply() {
33-
local F=${1:-"istio/fortio:latest"}
33+
local F=${1:-"fortio/fortio:latest"}
3434
pushd "$TOP/src/istio.io/istio" || return
3535
helm -n test template \
3636
--set fortioImage="$F" \
@@ -39,7 +39,7 @@ function testApply() {
3939
}
4040

4141
function testApply1() {
42-
testApply istio/fortio:1.0.1
42+
testApply fortio/fortio:1.2.0
4343
}
4444

4545
# Setup DNS entries - currently using gcloud

‎tests/helm/templates/fortio-cli.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: echosrv
20-
image: istio/fortio:latest
20+
image: fortio/fortio:latest
2121
imagePullPolicy: Always
2222
args:
2323
- load
@@ -52,7 +52,7 @@ spec:
5252
spec:
5353
containers:
5454
- name: echosrv
55-
image: istio/fortio:latest
55+
image: fortio/fortio:latest
5656
imagePullPolicy: Always
5757
args:
5858
- load
@@ -87,7 +87,7 @@ spec:
8787
spec:
8888
containers:
8989
- name: echosrv
90-
image: istio/fortio:latest
90+
image: fortio/fortio:latest
9191
imagePullPolicy: Always
9292
args:
9393
- load
@@ -123,7 +123,7 @@ spec:
123123
spec:
124124
containers:
125125
- name: echosrv
126-
image: istio/fortio:latest
126+
image: fortio/fortio:latest
127127
imagePullPolicy: Always
128128
args:
129129
- load
@@ -159,7 +159,7 @@ spec:
159159
spec:
160160
containers:
161161
- name: echosrv
162-
image: istio/fortio:latest
162+
image: fortio/fortio:latest
163163
imagePullPolicy: Always
164164
args:
165165
- load
@@ -192,7 +192,7 @@ spec:
192192
spec:
193193
containers:
194194
- name: echosrv
195-
image: istio/fortio:latest
195+
image: fortio/fortio:latest
196196
imagePullPolicy: Always
197197
args:
198198
- load
@@ -226,7 +226,7 @@ spec:
226226
spec:
227227
containers:
228228
- name: echosrv
229-
image: istio/fortio:latest
229+
image: fortio/fortio:latest
230230
imagePullPolicy: Always
231231
args:
232232
- load
@@ -260,7 +260,7 @@ spec:
260260
spec:
261261
containers:
262262
- name: echosrv
263-
image: istio/fortio:latest
263+
image: fortio/fortio:latest
264264
imagePullPolicy: Always
265265
args:
266266
- load

‎tests/helm/templates/fortio-master.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
spec:
2929
containers:
3030
- name: echosrv
31-
image: istio/fortio:latest
31+
image: fortio/fortio:latest
3232
imagePullPolicy: Always
3333
ports:
3434
- containerPort: 8080

‎tests/helm/templates/fortio-tproxy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
spec:
3131
containers:
3232
- name: echosrv
33-
image: istio/fortio:latest
33+
image: fortio/fortio:latest
3434
ports:
3535
- containerPort: 8080
3636
- containerPort: 8079

‎tests/helm/templates/fortio-ttls-small.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
spec:
6060
containers:
6161
- name: fortio
62-
image: istio/fortio:latest
62+
image: fortio/fortio:latest
6363
ports:
6464
- containerPort: 8080
6565
- containerPort: 8079
@@ -88,7 +88,7 @@ spec:
8888
spec:
8989
containers:
9090
- name: echosrv
91-
image: istio/fortio:latest
91+
image: fortio/fortio:latest
9292
imagePullPolicy: Always
9393
args:
9494
- load

‎tests/helm/templates/fortio-ttls.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ spec:
109109
spec:
110110
containers:
111111
- name: echosrv
112-
image: istio/fortio:latest
112+
image: fortio/fortio:latest
113113
imagePullPolicy: Always
114114
args:
115115
- load
@@ -142,7 +142,7 @@ spec:
142142
spec:
143143
containers:
144144
- name: echosrv
145-
image: istio/fortio:latest
145+
image: fortio/fortio:latest
146146
imagePullPolicy: Always
147147
args:
148148
- load
@@ -177,7 +177,7 @@ spec:
177177
spec:
178178
containers:
179179
- name: echosrv
180-
image: istio/fortio:latest
180+
image: fortio/fortio:latest
181181
imagePullPolicy: Always
182182
args:
183183
- load

‎tests/helm/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ domain: v10.istio.webinf.info
77
# Namespace where istio control plane is installed.
88
istioNamespace: istio-system
99

10-
#fortioImage: istio/fortio:latest
11-
fortioImage: istio/fortio:1.0.1
10+
#fortioImage: fortio/fortio:latest
11+
fortioImage: fortio/fortio:1.2.0
1212

1313
qps: 500
1414

‎tests/integration/example/integration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ENVOY_BINARY=$(make where-is-out)/envoy
3939
START_ENVOY=${WD}/../component/proxy/start_envoy
4040

4141
# Install Fortio
42-
( cd vendor/istio.io/fortio && go install . )
42+
( cd vendor/fortio.org/fortio && go install . )
4343

4444
# Run Tests
4545
SUMMARY='Tests Summary'

‎tools/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Istio Load Testing User Guide
22
### Introduction
33
This guide provides step-by-step instructions for using the `setup_perf_cluster.sh` load testing script.
4-
The script deploys a GKE cluster, an Istio service mesh and a GCE VM. The script then runs [Fortio](https://github.com/istio/fortio/#fortio)
4+
The script deploys a GKE cluster, an Istio service mesh and a GCE VM. The script then runs [Fortio](https://github.com/fortio/fortio/#fortio)
55
on the VM, 2 pods within the cluster (non-Istio) and 2 pods within the Istio mesh.
66

77
It should not be too difficult to adapt the script to other cloud providers or environments and contributions for additional automated setup are welcome.
@@ -30,7 +30,7 @@ $ git clone https://github.com/istio/istio.git && cd istio
3030
Optional but recommended:
3131

3232
If not already present from building from source,
33-
Install fortio: `go get istio.io/fortio` (so you can run `fortio report` to visualize the results)
33+
Install fortio: `go get fortio.org/fortio` (so you can run `fortio report` to visualize the results)
3434

3535
### Prepare the Istio Deployment Manifest and Istio Client
3636

@@ -177,7 +177,7 @@ Compare the test results to understand the load differential between the 3 test
177177

178178
### Interactive Testing / UI Graphing of results
179179

180-
Fortio provides a [Web UI](https://github.com/istio/fortio#webgraphical-ui) that
180+
Fortio provides a [Web UI](https://github.com/fortio/fortio#webgraphical-ui) that
181181
can be used to perform load testing. You can call the `get_ips` function to obtain Fortio endpoint information for further load testing:
182182
```
183183
$ get_ips
@@ -193,7 +193,7 @@ to one of the Fortio echo servers:
193193
`echosrv1.istio.svc.cluster.local:8080` or `echosrv2.istio.svc.cluster.local:8080`.
194194

195195
Fortio provides additional load testing capabilities not covered by this document. For more information, refer to the
196-
[Fortio documentation](https://github.com/istio/fortio/blob/master/README.md)
196+
[Fortio documentation](https://github.com/fortio/fortio/blob/master/README.md)
197197

198198
### Canonical Tests
199199

0 commit comments

Comments
 (0)