Clean up code; Move from arm to amd for kubenodes, for cl2 prom, graf…

…ana test pods to come up

tests/e2e/scenarios/scalability/run-test.sh

@@ -91,8 +91,7 @@ create_args+=("--networking=${CNI_PLUGIN:-calico}")
 if [[ "${CNI_PLUGIN}" == "amazonvpc" ]]; then
 create_args+=("--set spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true")
 fi
-# INSTANCE_IMAGE configures the image used for control plane and kube nodes
-create_args+=("--image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/server/20.04/stable/current/arm64/hvm/ebs-gp2/ami-id}")
+create_args+=("--image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/server/20.04/stable/current/amd64/hvm/ebs-gp2/ami-id}")
 create_args+=("--set spec.etcdClusters[0].manager.listenMetricsURLs=http://localhost:2382")
 create_args+=("--set spec.etcdClusters[0].manager.env=ETCD_QUOTA_BACKEND_BYTES=8589934592")
 create_args+=("--set spec.etcdClusters[1].manager.env=ETCD_QUOTA_BACKEND_BYTES=8589934592")
@@ -117,9 +116,9 @@ create_args+=("--set spec.kubeAPIServer.enableContentionProfiling=true")
 create_args+=("--node-count=${KUBE_NODE_COUNT:-101}")
 # TODO: track failures of tests (HostPort & OIDC) when using `--dns=none`
 create_args+=("--dns none")
-create_args+=("--node-size=t4g.large,c7g.large,c6g.large,m7g.large,m6g.large,r7g.large,r6g.large")
+create_args+=("--node-size=t3a.large,c7g.large,c7a.large,m7a.large,m6a.large,r7a.large,r6a.large")
 create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}")
-create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c6g.2xlarge}")
+create_args+=("--master-size=c7a.4xlarge")
 create_args+=("--zones=us-east-2a,us-east-2b,us-east-2c")
 
 
@@ -155,28 +154,19 @@ kops export kubecfg --admin --kubeconfig="${KUBECONFIG}"
 
 kops get instances
 
-if [[ "${RUN_CL2_TEST:-}" == "true" ]]; then
-  # CL2 uses KUBE_SSH_KEY_PATH path to ssh to instances for scraping metrics
-  export KUBE_SSH_KEY_PATH="/tmp/kops/${CLUSTER_NAME}/id_ed25519"
+# CL2 uses KUBE_SSH_KEY_PATH path to ssh to instances for scraping metrics
+export KUBE_SSH_KEY_PATH="/tmp/kops/${CLUSTER_NAME}/id_ed25519"
 
-  kubetest2 kops "${KUBETEST2_ARGS[@]}" \
+kubetest2 kops "${KUBETEST2_ARGS[@]}" \
   --test=clusterloader2 \
   --kubernetes-version="${K8S_VERSION}" \
   -- \
   --provider="${CLOUD_PROVIDER}" \
   --repo-root="${GOPATH}"/src/k8s.io/perf-tests \
   --test-configs="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/load/config.yaml \
+  --test-configs="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/huge-service/config.yaml \
+  --test-configs="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/access-tokens/config.yaml \
   --kube-config="${KUBECONFIG}"
-else
-  kubetest2 kops "${KUBETEST2_ARGS[@]}" \
-  --test=kops \
-  --kubernetes-version="${K8S_VERSION}" \
-  -- \
-  --test-package-version="${K8S_VERSION}" \
-  --parallel=1 \
-  --skip-regex="\[Serial\]" \
-  --focus-regex="\[Conformance\]"
-fi
 
 if [[ "${DELETE_CLUSTER:-}" == "true" ]]; then
   kubetest2 kops "${KUBETEST2_ARGS[@]}" --down