Use stress-test-resources file naming to avoid live test auto-discove…

…ry (#2039)

* Use stress-test-resources file naming to avoid live test auto-discovery

* Mount stress-test-resources.json to test-resources.json

* Bump stress-test-addons chart version

eng/common/scripts/stress-testing/deploy-stress-tests.ps1

@@ -121,8 +121,8 @@ function DeployStressPackage(
     Run helm dependency update $pkg.Directory
     if ($LASTEXITCODE) { return }
 
-    if (Test-Path "$($pkg.Directory)/test-resources.bicep") {
-        Run az bicep build -f "$($pkg.Directory)/test-resources.bicep"
+    if (Test-Path "$($pkg.Directory)/stress-test-resources.bicep") {
+        Run az bicep build -f "$($pkg.Directory)/stress-test-resources.bicep"
         if ($LASTEXITCODE) { return }
     }
 

tools/stress-cluster/chaos/README.md

@@ -146,20 +146,20 @@ The basic layout for a stress test is the following (see `examples/stress_deploy
 
 ```
 <stress test root directory>
-    Dockerfile                   # A Dockerfile for building the stress test image
-    test-resources.[bicep|json]  # An Azure Bicep or ARM template for deploying stress test azure resources.
-    parameters.json              # An ARM template parameters file that will be used at runtime along with the ARM template
+    Dockerfile                          # A Dockerfile for building the stress test image
+    stress-test-resources.[bicep|json]  # An Azure Bicep or ARM template for deploying stress test azure resources.
+    parameters.json                     # An ARM template parameters file that will be used at runtime along with the ARM template
 
-    Chart.yaml                   # A YAML file containing information about the helm chart and its dependencies
-    templates/                   # A directory of helm templates that will generate Kubernetes manifest files.
-                                 # Most commonly this will contain a Job/Pod spec snippet and a chaos mesh manifest.
+    Chart.yaml                          # A YAML file containing information about the helm chart and its dependencies
+    templates/                          # A directory of helm templates that will generate Kubernetes manifest files.
+                                        # Most commonly this will contain a Job/Pod spec snippet and a chaos mesh manifest.
 
     # Optional files/directories
 
     values.yaml                  # Any default helm template values for this chart, e.g. a `scenarios` list
     <misc scripts/configs>       # Any language specific files for building/running/deploying the test
     <source directories>         # Directories containing code for stress tests
-    <bicep modules>              # Any additional bicep module files/directories referenced by test-resources.bicep
+    <bicep modules>              # Any additional bicep module files/directories referenced by stress-test-resources.bicep
 ```
 
 ### Stress Test Metadata
@@ -201,7 +201,7 @@ RESOURCE_GROUP=<value>
 ### Stress Test Azure Resources
 
 Stress test resources can either be defined as azure bicep files, or an ARM template directly, provided there is
-a `chart/test-resources.json` file in place before running `helm install`.
+a `chart/stress-test-resources.json` file in place before running `helm install`.
 The stress test cluster and config boilerplate will handle running ARM deployments in an init container before
 stress test container startup.
 

tools/stress-cluster/chaos/examples/network-stress-example/Chart.yaml

@@ -10,5 +10,5 @@ annotations:
 
 dependencies:
 - name: stress-test-addons
-  version: 0.1.6
+  version: 0.1.7
   repository: https://stresstestcharts.blob.core.windows.net/helm/

tools/stress-cluster/chaos/examples/stress-deployment-example/Chart.yaml

@@ -10,5 +10,5 @@ annotations:
 
 dependencies:
 - name: stress-test-addons
-  version: 0.1.6
+  version: 0.1.7
   repository: https://stresstestcharts.blob.core.windows.net/helm/

tools/stress-cluster/cluster/kubernetes/stress-test-addons/deploy.sh

@@ -3,7 +3,7 @@ set -ex
 export AZURE_STORAGE_ACCOUNT=stresstestcharts
 export AZURE_STORAGE_KEY=$(az storage account keys list --account-name $AZURE_STORAGE_ACCOUNT -o tsv --query '[0].value')
 
-rm *.tgz
+rm -f ./*.tgz
 
 helm package  .
 helm repo index --url https://stresstestcharts.blob.core.windows.net/helm/ --merge index.yaml .

tools/stress-cluster/cluster/kubernetes/stress-test-addons/index.yaml

@@ -3,9 +3,9 @@ entries:
   stress-test-addons:
   - apiVersion: v2
     appVersion: v0.1
-    created: "2021-08-13T17:23:40.9241683-04:00"
+    created: "2021-09-24T17:01:27.6168346-04:00"
     description: Baseline resources and templates for stress testing clusters
-    digest: 2e0e076ca62ea57d05624e74880717e7edf0cbeda4d878132344702b376c3b71
+    digest: 8c775cda83c851f4465c6b5dd575d5b7ddc26d01dd1d6308d8247ec7c411b015
     name: stress-test-addons
     urls:
     - https://stresstestcharts.blob.core.windows.net/helm/stress-test-addons-0.1.6.tgz
@@ -46,4 +46,4 @@ entries:
     urls:
     - https://stresstestcharts.blob.core.windows.net/helm/stress-test-addons-0.1.2.tgz
     version: 0.1.2
-generated: "2021-08-13T17:23:40.9233485-04:00"
+generated: "2021-09-24T17:01:27.6162169-04:00"

tools/stress-cluster/cluster/kubernetes/stress-test-addons/templates/_deploy_configmap.tpl

@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   template: |
-    {{- .Files.Get "test-resources.json" | nindent 4 }}
+    {{- .Files.Get "stress-test-resources.json" | nindent 4 }}
   parameters: |
     {{- .Files.Get "parameters.json" | nindent 4 }}
 {{ end }}