Clean up traffic shifting test (#7369)

* Clean up traffic shifting test

* add var

* v1beta1

content/en/docs/tasks/traffic-management/traffic-shifting/index.md

@@ -60,11 +60,9 @@ the [Bookinfo](/docs/examples/bookinfo/#determine-the-ingress-ip-and-port) doc.
 
     {{< text syntax=bash outputis=yaml snip_id=verify_config_50_v3 >}}
     $ kubectl get virtualservice reviews -o yaml
-    apiVersion: networking.istio.io/v1alpha3
+    apiVersion: networking.istio.io/v1beta1
     kind: VirtualService
-    metadata:
-      name: reviews
-      ...
+    ...
     spec:
       hosts:
       - reviews

content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh

@@ -33,11 +33,9 @@ kubectl get virtualservice reviews -o yaml
 }
 
 ! read -r -d '' snip_verify_config_50_v3_out <<\ENDSNIP
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
-metadata:
-  name: reviews
-  ...
+...
 spec:
   hosts:
   - reviews

tests/trafficmanagement/scripts/traffic_shifting.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC1090,SC2154
 
 # Copyright Istio Authors
 #
@@ -18,24 +19,16 @@ set -e
 set -u
 set -o pipefail
 
-source ${REPO_ROOT}/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh
+source "${REPO_ROOT}/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh"
+source "${REPO_ROOT}/tests/util/samples.sh"
 
-# setup bookinfo & sleep pods
-kubectl label namespace default istio-injection=enabled --overwrite || true
+kubectl label namespace default istio-injection=enabled --overwrite
+startup_sleep_sample # needed for sending test requests with curl
 
-kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml
-kubectl apply -f samples/bookinfo/networking/bookinfo-gateway.yaml
-kubectl apply -f samples/bookinfo/networking/destination-rule-all.yaml
-kubectl apply -f samples/sleep/sleep.yaml
+# launch the bookinfo app
+startup_bookinfo_sample
 
-for deploy in "productpage-v1" "details-v1" "ratings-v1" "reviews-v1" "reviews-v2" "reviews-v3" "sleep"; do
-  if ! kubectl rollout status deployment "$deploy" --timeout 5m; then
-    echo "$deploy deployment rollout status check failed"
-    exit 1
-  fi
-done
-
-# Verification utils
+# Verification util
 
 SLEEP_POD=$(kubectl get pod -l app=sleep -n default -o 'jsonpath={.items..metadata.name}')
 INGRESS_URL="http://istio-ingressgateway.istio-system"
@@ -51,6 +44,7 @@ function reviews_v3_traffic_percentage() {
       v3_count=$((v3_count + 1))
     fi
   done
+  set -e
   function is_in_range() {
     local tol=10 #tolerance
     local lower_bound=$(($2 - tol))
@@ -63,19 +57,9 @@ function reviews_v3_traffic_percentage() {
   declare -a ranges=(0 25 50 75 100)
   for i in "${ranges[@]}"; do
     if is_in_range $v3_count "$i"; then
-      return "$i"
+      echo "$i"
     fi
   done
-  set -e
-}
-
-function verify_traffic_shift() {
-  reviews_v3_traffic_percentage
-  local got=$?
-  if ((got != $1)); then
-    echo "reviews-v3 traffic split mismatch: expected $1, got $got"
-    exit 1
-  fi
 }
 
 # Step 1 configure all traffic to v1
@@ -88,7 +72,7 @@ _run_and_verify_same snip_config_all_v1 "$expected"
 
 # Step 2: verify no rating stars visible, (reviews-v3 traffic=0%)
 
-verify_traffic_shift 0
+_run_and_verify_same reviews_v3_traffic_percentage 0
 
 # Step 3: switch 50% traffic to v3
 
@@ -98,14 +82,14 @@ istioctl experimental wait --for=distribution VirtualService reviews.default
 
 # Step 4: Confirm the rule was replaced
 
-_run_and_verify_contains snip_verify_config_50_v3 "subset: v3"
+_run_and_verify_elided snip_verify_config_50_v3 "$snip_verify_config_50_v3_out"
 
 # Step 5: verify rating stars visible 50% of the time
 
-verify_traffic_shift 50
+_run_and_verify_same reviews_v3_traffic_percentage 50
 
 # Step 6: route 100% traffic to v3
 
 snip_config_100_v3
 
-verify_traffic_shift 100
+_run_and_verify_same reviews_v3_traffic_percentage 100

tests/trafficmanagement/traffic_shifting_test.go

@@ -27,18 +27,18 @@ func TestTrafficShifting(t *testing.T) {
 		NewTest(t).
 		Run(istioio.NewBuilder("tasks__traffic_management__traffic_shifting").
 			Add(istioio.Script{
-				Input: istioio.Path("scripts/traffic_shifting.txt"),
+				Input: istioio.Path("scripts/traffic_shifting.sh"),
 			}).
 			Defer(istioio.Script{
 				Input: istioio.Inline{
 					FileName: "cleanup.sh",
 					Value: `
-kubectl delete -n default -f samples/bookinfo/platform/kube/bookinfo.yaml || true
-kubectl delete -f samples/bookinfo/platform/kube/bookinfo.yaml || true
-kubectl delete -f samples/bookinfo/networking/destination-rule-all.yaml || true
-kubectl delete -f samples/bookinfo/networking/virtual-service-all-v1.yaml || true
-kubectl delete -f samples/bookinfo/networking/bookinfo-gateway.yaml || true
-kubectl delete -f samples/sleep/sleep.yaml || true`,
+set +e # ignore cleanup errors
+source ${REPO_ROOT}/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh
+source ${REPO_ROOT}/tests/util/samples.sh
+snip_cleanup
+cleanup_bookinfo_sample
+cleanup_sleep_sample`,
 				},
 			}).
 			Build())