removed apps/ and moved subdirs up one level (#894)

Automatic merge from submit-queue

removed apps/ and moved subdirs up one level

**Release note**:

```release-note
<PLEASE PUT RELEASE-NOTE HERE, PUT NONE if NO RELEASE-NOTE>
NONE
```

Former-commit-id: 4f4226c

samples/bookinfo/BUILD

@@ -0,0 +1,20 @@
+filegroup(
+    name = "bookinfo",
+    srcs = [
+        "kube/bookinfo.yaml",
+        "kube/bookinfo-db.yaml",
+        "kube/bookinfo-mysql.yaml",
+        "kube/bookinfo-ratings-v2.yaml",
+        "kube/mixer-rule-additional-telemetry.yaml",
+        "kube/mixer-rule-ratings-denial.yaml",
+        "kube/mixer-rule-ratings-ratelimit.yaml",
+        "kube/route-rule-all-v1.yaml",
+        "kube/route-rule-ratings-db.yaml",
+        "kube/route-rule-ratings-test-delay.yaml",
+        "kube/route-rule-reviews-50-v3.yaml",
+        "kube/route-rule-reviews-test-v2.yaml",
+        "kube/route-rule-reviews-v2-v3.yaml",
+        "kube/route-rule-reviews-v3.yaml",
+    ],
+    visibility = ["//visibility:public"],
+)

samples/apps/bookinfo/consul/README.md → samples/bookinfo/consul/README.md

@@ -39,7 +39,7 @@ To build all images for the bookinfo sample for the consul adapter, run:
   ./build-docker-services.sh
   ```
 
-To bring up all containers directly, from the `samples/apps/bookinfo/consul` directory run
+To bring up all containers directly, from the `samples/bookinfo/consul` directory run
 
   ```
   docker-compose up -d
@@ -79,7 +79,7 @@ kubectl config set-context mac --cluster=mac
 kubectl config use-context mac
 ```
 
-You can create basic routing rules using istioctl from the `samples/apps/bookinfo/consul` directory:
+You can create basic routing rules using istioctl from the `samples/bookinfo/consul` directory:
 
 ```
 istioctl create -f consul-reviews-v1.yaml

samples/apps/bookinfo/consul/build-docker-services.sh → samples/bookinfo/consul/build-docker-services.sh

@@ -22,7 +22,7 @@ SCRIPTDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 HUB=istio
 WORKSPACE=$GOPATH/src/istio.io/pilot
 BINDIR=$WORKSPACE/bazel-bin
-APPSDIR=$GOPATH/src/istio.io/istio/samples/apps/bookinfo/src
+APPSDIR=$GOPATH/src/istio.io/istio/samples/bookinfo/src
 DISCOVERYDIR=$SCRIPTDIR/discovery
 PILOTAGENTPATH=$WORKSPACE/cmd/pilot-agent
 PILOTDISCOVERYPATH=$WORKSPACE/cmd/pilot-discovery

tests/e2e/tests/bookinfo/BUILD

@@ -4,7 +4,7 @@ go_test(
     name = "go_default_test",
     srcs = ["demo_test.go"],
     data = [
-        "//samples/apps/bookinfo",
+        "//samples/bookinfo",
         "//tests/apps/bookinfo/output:bookinfo_out",
     ],
     tags = ["manual"],

tests/e2e/tests/bookinfo/demo_test.go

@@ -37,11 +37,11 @@ import (
 const (
 	u1                    = "normal-user"
 	u2                    = "test-user"
-	bookinfoYaml          = "samples/apps/bookinfo/bookinfo.yaml"
-	bookinfoRatingsv2Yaml = "samples/apps/bookinfo/bookinfo-ratings-v2.yaml"
-	bookinfoDbYaml        = "samples/apps/bookinfo/bookinfo-db.yaml"
+	bookinfoYaml          = "samples/bookinfo/kube/bookinfo.yaml"
+	bookinfoRatingsv2Yaml = "samples/bookinfo/kube/bookinfo-ratings-v2.yaml"
+	bookinfoDbYaml        = "samples/bookinfo/kube/bookinfo-db.yaml"
 	modelDir              = "tests/apps/bookinfo/output"
-	rulesDir              = "samples/apps/bookinfo/rules"
+	rulesDir              = "samples/bookinfo/kube"
 	allRule               = "route-rule-all-v1.yaml"
 	delayRule             = "route-rule-ratings-test-delay.yaml"
 	fiftyRule             = "route-rule-reviews-50-v3.yaml"

tests/e2e/tests/mixer/BUILD

@@ -5,7 +5,7 @@ go_test(
     size = "large",
     srcs = ["mixer_test.go"],
     data = [
-        "//samples/apps/bookinfo",
+        "//samples/bookinfo",
         "//tests/e2e/tests:testdata",
     ],
     tags = ["manual"],

tests/e2e/tests/mixer/mixer_test.go

@@ -40,10 +40,10 @@ import (
 )
 
 const (
-	bookinfoYaml             = "samples/apps/bookinfo/bookinfo.yaml"
-	bookinfoRatingsv2Yaml    = "samples/apps/bookinfo/bookinfo-ratings-v2.yaml"
-	bookinfoDbYaml           = "samples/apps/bookinfo/bookinfo-db.yaml"
-	rulesDir                 = "samples/apps/bookinfo/rules"
+	bookinfoYaml             = "samples/bookinfo/kube/bookinfo.yaml"
+	bookinfoRatingsv2Yaml    = "samples/bookinfo/kube/bookinfo-ratings-v2.yaml"
+	bookinfoDbYaml           = "samples/bookinfo/kube/bookinfo-db.yaml"
+	rulesDir                 = "samples/bookinfo/kube"
 	rateLimitRule            = "mixer-rule-ratings-ratelimit.yaml"
 	denialRule               = "mixer-rule-ratings-denial.yaml"
 	newTelemetryRule         = "mixer-rule-additional-telemetry.yaml"