Updating chaos mesh version (Azure#3143)

* Updating chaos mesh version

* merge with main

* Revert "merge with main"

This reverts commit d8dcef5.

* update v0.1.16 for stress-test-addons dependencies

* Change context for stress watcher

* chart.lock updates

* stress watcher eol reverse

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

@@ -1,6 +1,6 @@
 dependencies:
 - name: stress-test-addons
   repository: https://stresstestcharts.blob.core.windows.net/helm/
-  version: 0.1.12
-digest: sha256:a2afbc89375d1518cd44194ca861e8a7a1ca1c16cfaea3409cdb48bfc910d878
-generated: "2021-11-16T19:17:24.5412749-05:00"
+  version: 0.1.16
+digest: sha256:75061792fdbebe57c664322579af6dc240ce8f464280ac5e192de72a29d4f63f
+generated: "2022-04-21T10:55:26.6989471-07:00"

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

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

tools/stress-cluster/chaos/examples/stress-debug-share-example/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: stress-test-addons
   repository: https://stresstestcharts.blob.core.windows.net/helm/
-  version: 0.1.12
-digest: sha256:a2afbc89375d1518cd44194ca861e8a7a1ca1c16cfaea3409cdb48bfc910d878
-generated: "2021-11-16T19:17:18.8584487-05:00"
+  version: 0.1.16
+digest: sha256:75061792fdbebe57c664322579af6dc240ce8f464280ac5e192de72a29d4f63f
+generated: "2022-04-21T10:55:32.4232188-07:00"

tools/stress-cluster/chaos/examples/stress-debug-share-example/Chart.yaml

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

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

@@ -1,6 +1,6 @@
 dependencies:
 - name: stress-test-addons
   repository: https://stresstestcharts.blob.core.windows.net/helm/
-  version: 0.1.12
-digest: sha256:a2afbc89375d1518cd44194ca861e8a7a1ca1c16cfaea3409cdb48bfc910d878
-generated: "2021-11-16T19:17:10.5545801-05:00"
+  version: 0.1.16
+digest: sha256:75061792fdbebe57c664322579af6dc240ce8f464280ac5e192de72a29d4f63f
+generated: "2022-04-21T10:55:37.5671906-07:00"

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

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

tools/stress-cluster/cluster/azure/main.bicep

@@ -16,7 +16,7 @@ param accessGroups array = [
     '56709ad9-8962-418a-ad0d-4b25fa962bae'
 ]
 
-var groupName = 'rg-stress-cluster-${groupSuffix}'
+param groupName string
 
 resource group 'Microsoft.Resources/resourceGroups@2020-10-01' = {
     name: groupName

tools/stress-cluster/cluster/kubernetes/stress-infrastructure/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: chaos-mesh
   repository: https://charts.chaos-mesh.org
-  version: v0.5.1
+  version: 2.1.4
 - name: stress-test-addons
   repository: https://stresstestcharts.blob.core.windows.net/helm/
-  version: 0.1.12
-digest: sha256:12f7cf03e2deaea7962617c193945d113091145390dc0642eddfadfe55e0aaaf
-generated: "2021-11-16T19:24:29.2765409-05:00"
+  version: 0.1.16
+digest: sha256:cb586d358c23bcad019902a793593328890fcd80981a28762561ee2b4e921f10
+generated: "2022-04-19T12:29:53.7265433-07:00"

tools/stress-cluster/cluster/kubernetes/stress-infrastructure/Chart.yaml

@@ -21,11 +21,11 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.17.0"
 
 dependencies:
 - name: chaos-mesh
-  version: 0.5.1
+  version: 2.1.4
   repository: https://charts.chaos-mesh.org
   condition: deploy.chaosmesh
 - name: stress-test-addons

tools/stress-cluster/cluster/kubernetes/stress-infrastructure/templates/stresswatcher.yaml

@@ -1,4 +1,4 @@
-{{ $ctx := deepCopy . | merge (dict "Scenario" "watcher" ) -}}
+{{ $ctx := fromYaml (include "stress-test-addons.util.mergeStressContext" (list . "watcher" )) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

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

@@ -39,4 +39,3 @@ provisionerAppId:
   test: 0bb65bdf-b175-4340-8654-5a0c52899729
   prod: de76c9fe-bc09-4967-b489-1872385929fa
   dev: ""
-

tools/stress-cluster/cluster/provision.ps1

@@ -1,11 +1,12 @@
 param (
-    [string]$Environment = 'test',
+    [string]$Environment = 'dev',
     [string]$Namespace = 'stress-infra',
     [switch]$Development = $false
 )
 
 $STATIC_TEST_DOTENV_NAME="public"
 $VALUES_FILE = "$PSScriptRoot/kubernetes/stress-test-addons/values.yaml"
+$STRESS_CLUSTER_RESOURCE_GROUP = ""
 
 function Run()
 {
@@ -72,6 +73,7 @@ function DeployStaticResources([hashtable]$params) {
         AZURE_CLIENT_OID = $oid
         AZURE_TENANT_ID = $spInfo.tenant
         AZURE_SUBSCRIPTION_ID = $params.subscriptionId
+        STRESS_CLUSTER_RESOURCE_GROUP = $STRESS_CLUSTER_RESOURCE_GROUP
     }
 
     # Powershell on windows does not play nicely passing strings with newlines as secret values
@@ -136,14 +138,15 @@ function DeployClusterResources([hashtable]$params) {
         -n "stress-deploy-$($params.groupSuffix)" `
         -l $params.clusterLocation `
         -f $PSScriptRoot/azure/main.bicep `
-        --parameters $PSScriptRoot/azure/parameters/$Environment.json
+        --parameters $PSScriptRoot/azure/parameters/$Environment.json `
+        --parameters groupName=$STRESS_CLUSTER_RESOURCE_GROUP
 
     SetEnvOutputs $params
 
     Write-Host "Importing cluster credentials"
     RunOrExitOnFailure az aks get-credentials `
         -n $params.clusterName `
-        -g rg-stress-cluster-$($params.groupSuffix) `
+        -g $STRESS_CLUSTER_RESOURCE_GROUP `
         --overwrite `
         --subscription $params.subscriptionId
 }
@@ -186,6 +189,7 @@ function main() {
 
     if (!$Development) {
         $params = LoadEnvParams
+        $STRESS_CLUSTER_RESOURCE_GROUP = "rg-stress-cluster-$($params.groupSuffix)"
         DeployStaticResources $params
         DeployClusterResources $params
     }