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
biefy · Aug 28, 2018 · c1f34f3 · c1f34f3
1 parent 7f3029b
commit c1f34f3
Show file tree

Hide file tree

Showing 77 changed files with 367 additions and 455 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -29,7 +29,7 @@ required = [
   "github.com/istio/tools/protoc-gen-docs",
   ### END Mixer codegen deps
   # fortio is built in vendor for the testing framework
-  "istio.io/fortio",
+  "fortio.org/fortio",
 ]
 
 ignored = [
@@ -334,7 +334,7 @@ ignored = [
   unused-packages = true
   non-go = true
   [[prune.project]]
-    name = "istio.io/fortio"
+    name = "fortio.org/fortio"
     non-go = false
     unused-packages = false
   [[prune.project]]
@@ -368,3 +368,4 @@ ignored = [
 [[override]]
   name = "github.com/imdario/mergo"
   revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"
+
diff --git a/mixer/test/client/env/http_client.go b/mixer/test/client/env/http_client.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"istio.io/fortio/fhttp"
+	"fortio.org/fortio/fhttp"
 )
 
 const (

diff --git a/samples/httpbin/sample-client/fortio-deploy.yaml b/samples/httpbin/sample-client/fortio-deploy.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: fortio
-        image: istio/fortio:latest_release
+        image: fortio/fortio:latest_release
         imagePullPolicy: Always
         ports:
         - containerPort: 8080

diff --git a/samples/rawvm/Makefile b/samples/rawvm/Makefile
@@ -1,5 +1,5 @@
 
-FORTIO_IMAGE:='istio/fortio:latest'
+FORTIO_IMAGE:='fortio/fortio:latest'
 VERBOSITY:=2
 NAMESPACE:=fortio
 

diff --git a/tests/e2e/tests/dashboard/dashboard_test.go b/tests/e2e/tests/dashboard/dashboard_test.go
@@ -31,8 +31,9 @@ import (
 	"github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 
-	"istio.io/fortio/fhttp"
-	"istio.io/fortio/periodic"
+	"fortio.org/fortio/fhttp"
+	"fortio.org/fortio/periodic"
+
 	"istio.io/istio/pkg/log"
 	"istio.io/istio/tests/e2e/framework"
 	"istio.io/istio/tests/util"
@@ -314,7 +315,7 @@ func setTestConfig() error {
 	tag := os.Getenv("FORTIO_TAG")
 	image := hub + "/fortio:" + tag
 	if hub == "" || tag == "" {
-		image = "istio/fortio:latest" // TODO: change
+		image = "fortio/fortio:latest" // TODO: change
 	}
 	log.Infof("Fortio hub %s tag %s -> image %s", hub, tag, image)
 	services := []framework.App{

diff --git a/tests/e2e/tests/mixer/mixer_test.go b/tests/e2e/tests/mixer/mixer_test.go
@@ -35,10 +35,11 @@ import (
 	"github.com/prometheus/client_golang/api/prometheus/v1"
 	"github.com/prometheus/common/model"
 
-	"istio.io/fortio/fhttp"
+	"fortio.org/fortio/fhttp"
+
+	// flog "fortio.org/fortio/log"
+	"fortio.org/fortio/periodic"
 
-	// flog "istio.io/fortio/log"
-	"istio.io/fortio/periodic"
 	"istio.io/istio/pkg/log"
 	"istio.io/istio/tests/e2e/framework"
 	"istio.io/istio/tests/util"

diff --git a/tests/e2e/tests/simple/a_simple_1_test.go b/tests/e2e/tests/simple/a_simple_1_test.go
@@ -34,8 +34,9 @@ import (
 	"testing"
 	"time"
 
-	"istio.io/fortio/fhttp"
-	"istio.io/fortio/periodic"
+	"fortio.org/fortio/fhttp"
+	"fortio.org/fortio/periodic"
+
 	"istio.io/istio/pkg/log"
 	"istio.io/istio/tests/e2e/framework"
 	"istio.io/istio/tests/util"
@@ -357,7 +358,7 @@ func setTestConfig() error {
 	tag := os.Getenv("FORTIO_TAG")
 	image := hub + "/fortio:" + tag
 	if hub == "" || tag == "" {
-		image = "istio/fortio:latest_release"
+		image = "fortio/fortio:latest_release"
 	}
 	log.Infof("Fortio hub %s tag %s -> image %s", hub, tag, image)
 	services := []framework.App{

diff --git a/tests/helm/setup.sh b/tests/helm/setup.sh
@@ -30,7 +30,7 @@ function testInstall() {
 
 # Apply the helm template
 function testApply() {
-   local F=${1:-"istio/fortio:latest"}
+   local F=${1:-"fortio/fortio:latest"}
    pushd "$TOP/src/istio.io/istio" || return
    helm -n test template \
     --set fortioImage="$F" \
@@ -39,7 +39,7 @@ function testApply() {
 }
 
 function testApply1() {
-    testApply istio/fortio:1.0.1
+    testApply fortio/fortio:1.2.0
 }
 
 # Setup DNS entries - currently using gcloud

diff --git a/tests/helm/templates/fortio-cli.yaml b/tests/helm/templates/fortio-cli.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -52,7 +52,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -87,7 +87,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -123,7 +123,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -159,7 +159,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -192,7 +192,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -226,7 +226,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -260,7 +260,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load

diff --git a/tests/helm/templates/fortio-master.yaml b/tests/helm/templates/fortio-master.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         ports:
          - containerPort: 8080

diff --git a/tests/helm/templates/fortio-tproxy.yaml b/tests/helm/templates/fortio-tproxy.yaml
@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         ports:
          - containerPort: 8080
          - containerPort: 8079

diff --git a/tests/helm/templates/fortio-ttls-small.yaml b/tests/helm/templates/fortio-ttls-small.yaml
@@ -59,7 +59,7 @@ spec:
     spec:
       containers:
       - name: fortio
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         ports:
          - containerPort: 8080
          - containerPort: 8079
@@ -88,7 +88,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load

diff --git a/tests/helm/templates/fortio-ttls.yaml b/tests/helm/templates/fortio-ttls.yaml
@@ -109,7 +109,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -142,7 +142,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load
@@ -177,7 +177,7 @@ spec:
     spec:
       containers:
       - name: echosrv
-        image: istio/fortio:latest
+        image: fortio/fortio:latest
         imagePullPolicy: Always
         args:
           - load

diff --git a/tests/helm/values.yaml b/tests/helm/values.yaml
@@ -7,8 +7,8 @@ domain: v10.istio.webinf.info
 # Namespace where istio control plane is installed.
 istioNamespace: istio-system
 
-#fortioImage: istio/fortio:latest
-fortioImage: istio/fortio:1.0.1
+#fortioImage: fortio/fortio:latest
+fortioImage: fortio/fortio:1.2.0
 
 qps: 500
 

diff --git a/tests/integration/example/integration.sh b/tests/integration/example/integration.sh
@@ -39,7 +39,7 @@ ENVOY_BINARY=$(make where-is-out)/envoy
 START_ENVOY=${WD}/../component/proxy/start_envoy
 
 # Install Fortio
-( cd vendor/istio.io/fortio && go install . )
+( cd vendor/fortio.org/fortio && go install . )
 
 # Run Tests
 SUMMARY='Tests Summary'

diff --git a/tools/README.md b/tools/README.md
@@ -1,7 +1,7 @@
 # Istio Load Testing User Guide
 ### Introduction
 This guide provides step-by-step instructions for using the `setup_perf_cluster.sh` load testing script.
-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)
+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)
 on the VM, 2 pods within the cluster (non-Istio) and 2 pods within the Istio mesh.
 
 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
 Optional but recommended:
 
 If not already present from building from source,
-Install fortio: `go get istio.io/fortio` (so you can run `fortio report` to visualize the results)
+Install fortio: `go get fortio.org/fortio` (so you can run `fortio report` to visualize the results)
 
 ### Prepare the Istio Deployment Manifest and Istio Client
 
@@ -177,7 +177,7 @@ Compare the test results to understand the load differential between the 3 test
 
 ### Interactive Testing / UI Graphing of results
 
-Fortio provides a [Web UI](https://github.com/istio/fortio#webgraphical-ui) that
+Fortio provides a [Web UI](https://github.com/fortio/fortio#webgraphical-ui) that
 can be used to perform load testing. You can call the `get_ips` function to obtain Fortio endpoint information for further load testing:
 ```
 $ get_ips
@@ -193,7 +193,7 @@ to one of the Fortio echo servers:
 `echosrv1.istio.svc.cluster.local:8080` or `echosrv2.istio.svc.cluster.local:8080`.
 
 Fortio provides additional load testing capabilities not covered by this document. For more information, refer to the
-[Fortio documentation](https://github.com/istio/fortio/blob/master/README.md)
+[Fortio documentation](https://github.com/fortio/fortio/blob/master/README.md)
 
 ### Canonical Tests
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ import ( @@
     	"strings"
     	"time"
-    	"istio.io/fortio/fhttp"
+    	"fortio.org/fortio/fhttp"
     )
     const (
@@ Expand Down @@