From 0b47a1544a5eff56036a079c0e27150e29dc78ae Mon Sep 17 00:00:00 2001 From: Jemin Date: Sun, 28 Jul 2024 20:06:11 +0900 Subject: [PATCH 1/4] Update install-chaos-faults duration Signed-off-by: Jemin --- .../blankCanvasTemplate.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts index 6f13e4a8e61..c940229b76c 100644 --- a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts +++ b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts @@ -64,7 +64,11 @@ function kubernetesBlankCanvasTemplate( name: '', image: `${imageRegistry.repo}/k8s:2.11.0`, command: ['sh', '-c'], - args: ['kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && sleep 30'] + args: [ + 'kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && ' + + 'faultCount=$(ls /tmp/ | grep -E "\.ya?ml$" | wc -l) && ' + + 'until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; echo "Waiting for ChaosExperiment CR Ready..." ; done; echo "ChaosExperiment CR Ready"' + ] } }, { From c101716002ef9000f725aebde8171e751bc46516 Mon Sep 17 00:00:00 2001 From: Jemin Date: Mon, 29 Jul 2024 02:21:27 +0900 Subject: [PATCH 2/4] Fix args array format Signed-off-by: Jemin --- .../ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts index c940229b76c..f659208765a 100644 --- a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts +++ b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts @@ -65,9 +65,7 @@ function kubernetesBlankCanvasTemplate( image: `${imageRegistry.repo}/k8s:2.11.0`, command: ['sh', '-c'], args: [ - 'kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && ' + - 'faultCount=$(ls /tmp/ | grep -E "\.ya?ml$" | wc -l) && ' + - 'until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; echo "Waiting for ChaosExperiment CR Ready..." ; done; echo "ChaosExperiment CR Ready"' + 'kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && faultCount=$(ls /tmp/ | grep -E "(.yaml$|.yml$)" | wc -l) && until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; echo "Waiting for ChaosExperiment CR Ready..." ; done; echo "ChaosExperiment CR Ready"' ] } }, From 154abaa4df77c51d46af853a8a8962fd09223f51 Mon Sep 17 00:00:00 2001 From: Jemin Date: Mon, 2 Sep 2024 23:05:57 +0900 Subject: [PATCH 3/4] delete existing chaosexperiments CR Signed-off-by: Jemin --- .../ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts index f659208765a..e4b019e06d5 100644 --- a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts +++ b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts @@ -65,7 +65,7 @@ function kubernetesBlankCanvasTemplate( image: `${imageRegistry.repo}/k8s:2.11.0`, command: ['sh', '-c'], args: [ - 'kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && faultCount=$(ls /tmp/ | grep -E "(.yaml$|.yml$)" | wc -l) && until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; echo "Waiting for ChaosExperiment CR Ready..." ; done; echo "ChaosExperiment CR Ready"' + 'kubectl delete chaosexperiments -n {{workflow.parameters.adminModeNamespace}} --all && kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && faultCount=$(ls /tmp/ | grep -E "(.yaml$|.yml$)" | wc -l) && until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} ; done; echo "ChaosExperiment CR Ready"' ] } }, From 8bc010ae57294f3afb1e4b40de3b8a5aa29b93e0 Mon Sep 17 00:00:00 2001 From: Jemin Date: Fri, 6 Sep 2024 20:52:59 +0900 Subject: [PATCH 4/4] add trailing comma Signed-off-by: Jemin --- .../ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts index e4b019e06d5..c009106dea7 100644 --- a/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts +++ b/chaoscenter/web/src/views/ExperimentBuilderTemplateSelection/blankCanvasTemplate.ts @@ -65,7 +65,7 @@ function kubernetesBlankCanvasTemplate( image: `${imageRegistry.repo}/k8s:2.11.0`, command: ['sh', '-c'], args: [ - 'kubectl delete chaosexperiments -n {{workflow.parameters.adminModeNamespace}} --all && kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && faultCount=$(ls /tmp/ | grep -E "(.yaml$|.yml$)" | wc -l) && until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} ; done; echo "ChaosExperiment CR Ready"' + 'kubectl delete chaosexperiments -n {{workflow.parameters.adminModeNamespace}} --all && kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} && faultCount=$(ls /tmp/ | grep -E "(.yaml$|.yml$)" | wc -l) && until [[ $(kubectl get -f /tmp/ --no-headers | wc -l) -eq $faultCount ]]; do sleep 1; kubectl apply -f /tmp/ -n {{workflow.parameters.adminModeNamespace}} ; done; echo "ChaosExperiment CR Ready"', ] } },