Addressed comments from PR review

Author: Mazhar Islam

walkthroughs/howto-k8s-appmesh-load-test/README.md

@@ -2,11 +2,18 @@
 This walkthrough demonstrates how to load test AppMesh on EKS. It can be used as a tool for further load testing in different mesh configuration. We use [Fortio](https://github.com/fortio/fortio) to generate the load. Currently, this walkthrough only focuses AppMesh on EKS. 
 
 ## Step 1: Prerequisites
-1. [Walkthrough: App Mesh with EKS](../eks/)
-   1. Make sure you have "appmesh-prometheus" installed. You may follow this [live docs](https://aws.github.io/aws-app-mesh-controller-for-k8s/) _Guide_ section for further installation support.
-   2. Alternatively, you can follow this doc: [Getting started with AWS App Mesh and Kubernetes](https://docs.aws.amazon.com/app-mesh/latest/userguide/getting-started-kubernetes.html) to install appmesh-controller and EKS cluster using `eksctl`.
-2. Clone this repository and navigate to the `walkthroughs/howto-k8s-appmesh-load-test` folder, all the commands henceforth are assumed to be run from the same directory as this README.
-3. Make sure you have the latest version of [AWS CLI v2](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html) installed.
+1. [Walkthrough: App Mesh with EKS](../eks/). Make sure you have:
+   1. Cloned the [AWS AppMesh controller repo](https://github.com/aws/aws-app-mesh-controller-for-k8s). We will need this controller repo path (`CONTROLLER_PATH`) in [step 2](##step-2:-set-environment-variables).
+   2. Created an EKS cluster and setup kubeconfig.
+   3. Installed "appmesh-prometheus". You may follow this [App Mesh Prometheus](https://github.com/aws/eks-charts/tree/master/stable/appmesh-prometheus) chart for installation support.
+   4. This load test uses [Ginkgo](https://github.com/onsi/ginkgo/tree/v1.16.4). Make sure you have ginkgo installed by running `ginkgo version`. If it's not, you may need to install it:
+      1. Install [Go](https://go.dev/doc/install), if you haven't already.
+      2. Install Ginkgo v1.16.4 (currently, AppMesh controller uses [ginkgo v1.16.4](https://github.com/aws/aws-app-mesh-controller-for-k8s/blob/master/go.mod#L13))
+         1. `go get -u github.com/onsi/ginkgo/[email protected]` or 
+         2. `go install github.com/onsi/ginkgo/[email protected]` for GO version 1.17+
+   5. (Optional) You can follow this doc: [Getting started with AWS App Mesh and Kubernetes](https://docs.aws.amazon.com/app-mesh/latest/userguide/getting-started-kubernetes.html) to install appmesh-controller and EKS cluster using `eksctl`.
+2. Clone this repository and navigate to the `walkthroughs/howto-k8s-appmesh-load-test` folder, all the commands henceforth are assumed to be run from the same directory as this `README`.
+3. Make sure you have the latest version of [AWS CLI v2](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html) or [AWS CLI v1](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv1.html) installed.
 4. This test requires Python 3 or later (tested with Python 3.9.6). So make sure you have [Python 3](https://www.python.org/downloads/) installed.  
 5. Load test results will be stored into S3 bucket. So, in `scripts/constants.py` give your `S3_BUCKET` a unique name. 
 6. In case you get `AccessDeniedException` (or any kind of accessing AWS resource denied exception) while creating any AppMesh resources (e.g., VirtualNode), don't forget to authenticate with your AWS account.
@@ -16,7 +23,7 @@ This walkthrough demonstrates how to load test AppMesh on EKS. It can be used as
 We need to set a few environment variables before starting the load tests.
 
 ```bash
-export CONTROLLER_PATH=<Path to the controller directory e.g., /home/userName/workplace/appmesh-controller/aws-app-mesh-controller-for-k8s>
+export CONTROLLER_PATH=<Path to the controller repo we cloned in step 1, e.g., /home/userName/workplace/appmesh-controller/aws-app-mesh-controller-for-k8s>
 export CLUSTER_NAME=<Name of the EKS cluster, e.g., appmeshtest>
 export KUBECONFIG=<If eksctl is used to create the cluster, the KUBECONFIG will look like: ~/.kube/eksctl/clusters/cluster-name>
 export AWS_REGION=us-west-2

walkthroughs/howto-k8s-appmesh-load-test/cluster.yaml

@@ -9,7 +9,7 @@ metadata:
 nodeGroups:
   - name: ng-1
     instanceType: m5.4xlarge
-    desiredCapacity: 10
+    desiredCapacity: 4
     volumeSize: 80
     ssh:
       allow: true # will use ~/.ssh/id_rsa.pub as the default ssh key

walkthroughs/howto-k8s-appmesh-load-test/config.json

@@ -9,7 +9,7 @@
                     "2": ["4"]
                 },
   "load_tests": [
-    {"test_name": "experiment16-qps50000-t10-c400", "url": "http://service-0.tls-e2e.svc.cluster.local:9080/", "qps": "50000", "t": "10s", "c":"400"}
+    {"test_name": "experiment_x", "url": "http://service-0.tls-e2e.svc.cluster.local:9080/", "qps": "5000", "t": "10s", "c":"400"}
   ],
   "metrics": {
     "envoy_ingress_rate_by_replica_set": "sum(rate(envoy_cluster_upstream_rq{job=\"appmesh-envoy\",kubernetes_pod_name=~\"node-.*\",envoy_cluster_name=~\"cds_ingress.*\"}[10s])) by (kubernetes_pod_name)",

walkthroughs/howto-k8s-appmesh-load-test/scripts/analyze_load_test_data.py

@@ -2,6 +2,7 @@
 import json
 import os
 import subprocess
+from collections import OrderedDict
 from pathlib import Path
 from pprint import pprint
 
@@ -28,7 +29,6 @@ def get_s3_data():
 
 
 def plot_graph(actual_QPS_list, node_0_mem_list):
-    node_0_mem_list = [float(x) for x in node_0_mem_list]
     Y = [x for _, x in sorted(zip(actual_QPS_list, node_0_mem_list))]
     X = sorted(actual_QPS_list)
     xpoints = np.array(X)
@@ -69,16 +69,19 @@ def read_load_test_data():
                     node_0_mem = []
                     for line in c:
                         if "node-0" in line[0]:
-                            node_0_mem.append(line[2])
+                            node_0_mem.append(float(line[2]))
                     max_mem = max(node_0_mem)
                     node_0_mem_list.append(max_mem)
                     attrb["max_mem"] = max_mem
             key = Path(f)
             experiment_results[os.path.join(key.parts[-3], key.parts[-2])] = attrb
 
     # for research purpose
-    print("Experiment results:")
-    pprint(experiment_results)
+    sorted_experiment_results = OrderedDict()
+    for k, v in sorted(experiment_results.items(), key=lambda item: item[1]['max_mem']):
+        sorted_experiment_results[k] = v
+    print("Experiment results sorted:\n")
+    pprint(sorted_experiment_results)
 
     return actual_qps_list, node_0_mem_list
 

walkthroughs/howto-k8s-appmesh-load-test/scripts/driver.sh

@@ -39,6 +39,17 @@ if [ -z "${VPC_ID}" ]; then
     err "VPC_ID is not set"
 fi
 
+# Check creds
+if [ -n "${USER}" ]; then
+  check_version "isengardcli version"
+  if [ $? -eq 0 ]
+  then
+    eval "$(isengardcli creds "$USER")"
+    status=$?
+    [ $status -eq 0 ] && echo "Ran isengard creds successfully!" || (err "isengard creds error.")
+  fi
+fi
+
 # Install python3 dependencies
 exec_command "python3 --version"