@@ -30,6 +30,11 @@ if [[ -z "${K8S_VERSION:-}" ]]; then
3030  K8S_VERSION=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt
3131fi 
3232
33+ #  Default Scale Scenario to performance
34+ if  [[ -z  " ${SCALE_SCENARIO:- } " ;  then 
35+   SCALE_SCENARIO=" performance" 
36+ fi 
37+ 
3338#  Default cloud provider to aws
3439if  [[ -z  " ${CLOUD_PROVIDER:- } " ;  then 
3540  CLOUD_PROVIDER=" aws" 
@@ -86,6 +91,8 @@ create_args+=("--set spec.etcdClusters[1].manager.env=ETCD_QUOTA_BACKEND_BYTES=8
8691create_args+=(" --set spec.cloudControllerManager.concurrentNodeSyncs=10" 
8792create_args+=(" --set spec.kubelet.maxPods=96" 
8893create_args+=(" --set spec.kubeScheduler.authorizationAlwaysAllowPaths=/healthz" 
94+ create_args+=(" --set spec.kubeScheduler.authorizationAlwaysAllowPaths=/livez" 
95+ create_args+=(" --set spec.kubeScheduler.authorizationAlwaysAllowPaths=/readyz" 
8996create_args+=(" --set spec.kubeScheduler.authorizationAlwaysAllowPaths=/metrics" 
9097create_args+=(" --set spec.kubeScheduler.kubeAPIQPS=500" 
9198create_args+=(" --set spec.kubeScheduler.kubeAPIBurst=500" 
@@ -154,7 +161,7 @@ if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
154161fi 
155162
156163#  More time for bigger clusters
157- KUBETEST2_ARGS+=(" --validation-wait=55m " 
164+ KUBETEST2_ARGS+=(" --validation-wait=75m " 
158165KUBETEST2_ARGS+=(" --validation-count=3" 
159166KUBETEST2_ARGS+=(" --validation-interval=60s" 
160167
172179export  PROMETHEUS_KUBE_PROXY_SELECTOR_KEY=" k8s-app" 
173180export  PROMETHEUS_SCRAPE_APISERVER_ONLY=" true" 
174181export  CL2_PROMETHEUS_TOLERATE_MASTER=" true" 
175- if  [[ " ${CLOUD_PROVIDER} " ==  " aws" ;  then 
182+ 
183+ if  [[ " ${CLOUD_PROVIDER} " ==  " aws" &&  " ${SCALE_SCENARIO} " ==  " performance" ;  then 
176184  #  CL2 uses KUBE_SSH_KEY_PATH path to ssh to instances for scraping metrics
177185  export  KUBE_SSH_KEY_PATH=" /tmp/kops/${CLUSTER_NAME} /id_ed25519" 
178186  cat >  " ${GOPATH} " << EOL 
@@ -188,20 +196,40 @@ else
188196EOL 
189197fi 
190198
191- kubetest2 kops " ${KUBETEST2_ARGS[@]} " 
192-   --up \
193-   --kubernetes-version=" ${K8S_VERSION} " 
194-   --create-args=" ${create_args[*]} " 
195-   --test=clusterloader2 \
196-   -- \
197-   --provider=" ${CLOUD_PROVIDER} " 
198-   --repo-root=" ${GOPATH} " 
199-   --test-configs=" ${GOPATH} " 
200-   --test-overrides=" ${GOPATH} " 
201-   --extra-args=" --experimental-prometheus-snapshot-to-report-dir=true" 
202-   --kube-config=" ${HOME} /.kube/config" 
203-   #  --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/experiments/enable_restart_count_check.yaml \
204-   #  --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/experiments/ignore_known_gce_container_restarts.yaml \
205-   #  --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/overrides/5000_nodes.yaml \
206-   #  --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/huge-service/config.yaml \
207-   #  --test-overrides="${GOPATH}"/src/k8s.io/perf-tests/clusterloader2/testing/access-tokens/config.yaml \
199+ CLUSTERLOADER2_ARGS=()
200+ if  [[ " ${ENABLE_DRA: false} " ==  " true" ;  then 
201+   CLUSTERLOADER2_ARGS+=(" --test-configs=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/dra/config.yaml" 
202+ else 
203+   CLUSTERLOADER2_ARGS+=(" --test-configs=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/load/config.yaml" 
204+   CLUSTERLOADER2_ARGS+=(" --test-configs=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/huge-service/config.yaml" 
205+   CLUSTERLOADER2_ARGS+=(" --test-configs=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/access-tokens/config.yaml" 
206+   CLUSTERLOADER2_ARGS+=(" --test-overrides=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/load/overrides.yaml" 
207+   CLUSTERLOADER2_ARGS+=(" --test-overrides=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/experiments/enable_restart_count_check.yaml" 
208+   CLUSTERLOADER2_ARGS+=(" --test-overrides=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/experiments/ignore_known_gce_container_restarts.yaml" 
209+   CLUSTERLOADER2_ARGS+=(" --test-overrides=${GOPATH} /src/k8s.io/perf-tests/clusterloader2/testing/overrides/5000_nodes.yaml" 
210+ fi 
211+ 
212+ if  [[ " ${SCALE_SCENARIO: performance} " ==  " correctness" ;  then 
213+   kubetest2 kops " ${KUBETEST2_ARGS[@]} " 
214+     --up \
215+     --kubernetes-version=" ${K8S_VERSION} " 
216+     --create-args=" ${create_args[*]} " 
217+     --test=kops \
218+     -- \
219+     --test-package-url=https://storage.googleapis.com/k8s-release-dev \
220+     --test-package-dir=ci \
221+     --test-package-marker=latest.txt \
222+     --skip-regex=" \[Driver:.gcepd\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:([^L].*|L[^o].*|Lo[^a].*|Loa[^d].*)\]\[KubeUp\]" 
223+     --parallel=25
224+ else 
225+   kubetest2 kops " ${KUBETEST2_ARGS[@]} " 
226+     --up \
227+     --kubernetes-version=" ${K8S_VERSION} " 
228+     --create-args=" ${create_args[*]} " 
229+     --test=clusterloader2 \
230+     -- \
231+     --provider=" ${CLOUD_PROVIDER} " 
232+     --repo-root=" ${GOPATH} " 
233+     --kube-config=" ${HOME} /.kube/config" 
234+     " ${CLUSTERLOADER2_ARGS[@]} " 
235+ fi 
0 commit comments