From aef7d97c23dc0b5d1a0e8b61e021bb598b547e0f Mon Sep 17 00:00:00 2001 From: OUM NIVRATHI KALE Date: Thu, 13 May 2021 20:27:00 +0530 Subject: [PATCH] chore(charts):Added Labels for Workflow and Engine (#437) * Adding subject and label Signed-off-by: Oum Kale * updating context for infra level Signed-off-by: Oum Kale * updating chaosengine name Signed-off-by: Oum Kale * updating image to litmuschaos/k8s:latest Signed-off-by: Oum Kale --- workflows/k8-calico-node/workflow.yaml | 6 ++++++ workflows/k8-kiam/workflow.yaml | 6 ++++++ workflows/k8-pod-delete/workflow.yaml | 6 ++++++ workflows/k8-service-kill/workflow.yaml | 6 ++++++ .../k8-wavefront-collector/workflow.yaml | 6 ++++++ workflows/kube-proxy-all/workflow.yaml | 18 +++++++++++++++++ workflows/kube-proxy-all/workflow_cron.yaml | 20 ++++++++++++++++++- .../namespaced-scope-chaos/workflow.yaml | 4 ++++ .../namespaced-scope-chaos/workflow_cron.yaml | 4 ++++ workflows/node-cpu-hog/workflow.yaml | 6 ++++++ workflows/node-cpu-hog/workflow_cron.yaml | 6 ++++++ workflows/node-memory-hog/workflow.yaml | 6 ++++++ workflows/node-memory-hog/workflow_cron.yaml | 6 ++++++ workflows/pod-cpu-hog/workflow.yaml | 6 ++++++ workflows/pod-cpu-hog/workflow_cron.yaml | 6 ++++++ workflows/pod-delete/workflow.yaml | 6 ++++++ workflows/pod-delete/workflow_cron.yaml | 6 ++++++ workflows/pod-memory-hog/workflow.yaml | 6 ++++++ workflows/pod-memory-hog/workflow_cron.yaml | 6 ++++++ workflows/podtato-head/workflow.yaml | 6 +++++- workflows/podtato-head/workflow_cron.yaml | 6 +++++- .../usingCmdProbe/workflow.yaml | 14 +++++++++++++ .../usingCmdProbe/workflow_cron.yaml | 16 ++++++++++++++- .../usingPromProbe/workflow.yaml | 14 +++++++++++++ .../usingPromProbe/workflow_cron.yaml | 16 ++++++++++++++- 25 files changed, 203 insertions(+), 5 deletions(-) diff --git a/workflows/k8-calico-node/workflow.yaml b/workflows/k8-calico-node/workflow.yaml index cccd431..5ea3f1e 100644 --- a/workflows/k8-calico-node/workflow.yaml +++ b/workflows/k8-calico-node/workflow.yaml @@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: generateName: argowf-chaos- + labels: + subject: "{{workflow.parameters.appNamespace}}_calico-node" spec: entrypoint: pdbcreate poddisruptionbudget: @@ -62,6 +64,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_calico-node" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: @@ -110,6 +114,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_calico-node" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: diff --git a/workflows/k8-kiam/workflow.yaml b/workflows/k8-kiam/workflow.yaml index a7007f8..af28570 100644 --- a/workflows/k8-kiam/workflow.yaml +++ b/workflows/k8-kiam/workflow.yaml @@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: generateName: argowf-chaos- + labels: + subject: "{{workflow.parameters.appNamespace}}_kiam" spec: entrypoint: pdbcreate poddisruptionbudget: @@ -62,6 +64,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kiam" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: @@ -110,6 +114,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kiam" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: diff --git a/workflows/k8-pod-delete/workflow.yaml b/workflows/k8-pod-delete/workflow.yaml index 5c093ec..d327aa0 100644 --- a/workflows/k8-pod-delete/workflow.yaml +++ b/workflows/k8-pod-delete/workflow.yaml @@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: generateName: argowf-chaos- + labels: + subject: "{{workflow.parameters.appNamespace}}_nginx-demo-app" spec: entrypoint: pdbcreate poddisruptionbudget: @@ -85,6 +87,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_nginx-demo-app" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: @@ -133,6 +137,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_nginx-demo-app" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: diff --git a/workflows/k8-service-kill/workflow.yaml b/workflows/k8-service-kill/workflow.yaml index b7f8253..ca3dd9d 100644 --- a/workflows/k8-service-kill/workflow.yaml +++ b/workflows/k8-service-kill/workflow.yaml @@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: generateName: argowf-chaos- + labels: + subject: "{{workflow.parameters.appNamespace}}_calico-node" spec: entrypoint: pdbcreate poddisruptionbudget: @@ -62,6 +64,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_calico-node" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: @@ -110,6 +114,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_calico-node" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: diff --git a/workflows/k8-wavefront-collector/workflow.yaml b/workflows/k8-wavefront-collector/workflow.yaml index c6e42bd..d568c01 100644 --- a/workflows/k8-wavefront-collector/workflow.yaml +++ b/workflows/k8-wavefront-collector/workflow.yaml @@ -4,6 +4,8 @@ apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: generateName: argowf-chaos- + labels: + subject: "{{workflow.parameters.appNamespace}}_wavefront-collector" spec: entrypoint: pdbcreate poddisruptionbudget: @@ -62,6 +64,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_wavefront-collector" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: @@ -110,6 +114,8 @@ spec: metadata: name: k8-pod-delete namespace: {{workflow.parameters.appCurrentNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_wavefront-collector" spec: #ex. values: ns1:name=percona,ns2:run=nginx appinfo: diff --git a/workflows/kube-proxy-all/workflow.yaml b/workflows/kube-proxy-all/workflow.yaml index a5f2b52..7ecdc57 100644 --- a/workflows/kube-proxy-all/workflow.yaml +++ b/workflows/kube-proxy-all/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-kube-proxy-all- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,12 @@ spec: parameters: - name: adminModeNamespace value: litmus + - name: appNamespace + value: "kube-system" + - name: contextCPUHog + value: "node-cpu-hog_infra" + - name: contextMemoryHog + value: "node-memory-hog_infra" templates: - name: argowf-chaos @@ -52,6 +60,8 @@ spec: metadata: name: kube-proxy-node-cpu-hog namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: {{workflow.parameters.contextCPUHog}} spec: jobCleanUpPolicy: retain engineState: 'active' @@ -82,6 +92,8 @@ spec: metadata: name: kube-proxy-pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system @@ -119,6 +131,8 @@ spec: metadata: name: kube-proxy-pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system @@ -156,6 +170,8 @@ spec: metadata: name: kube-proxy-node-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: {{workflow.parameters.contextMemoryHog}} spec: jobCleanUpPolicy: retain engineState: 'active' @@ -185,6 +201,8 @@ spec: metadata: name: kube-proxy-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/kube-proxy-all/workflow_cron.yaml b/workflows/kube-proxy-all/workflow_cron.yaml index 10af89d..ed0dee9 100644 --- a/workflows/kube-proxy-all/workflow_cron.yaml +++ b/workflows/kube-proxy-all/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argo-chaos-kube-proxy-cron-wf namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,12 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" + - name: contextCPUHog + value: "node-cpu-hog_infra" + - name: contextMemoryHog + value: "node-memory-hog_infra" templates: - name: argowf-chaos steps: @@ -55,6 +63,8 @@ spec: metadata: name: kube-proxy-node-cpu-hog namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: {{workflow.parameters.contextCPUHog}} spec: jobCleanUpPolicy: retain engineState: 'active' @@ -85,6 +95,8 @@ spec: metadata: name: kube-proxy-pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system @@ -122,6 +134,8 @@ spec: metadata: name: kube-proxy-pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system @@ -159,6 +173,8 @@ spec: metadata: name: kube-proxy-node-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: {{workflow.parameters.contextMemoryHog}} spec: jobCleanUpPolicy: retain engineState: 'active' @@ -188,6 +204,8 @@ spec: metadata: name: kube-proxy-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system @@ -217,4 +235,4 @@ spec: command: [sh, -c] args: - "kubectl delete chaosengines kube-proxy-node-cpu-hog kube-proxy-pod-memory-hog-chaos kube-proxy-pod-cpu-hog-chaos kube-proxy-node-memory-hog-chaos kube-proxy-pod-delete-chaos -n - {{workflow.parameters.adminModeNamespace}}" \ No newline at end of file + {{workflow.parameters.adminModeNamespace}}" diff --git a/workflows/namespaced-scope-chaos/workflow.yaml b/workflows/namespaced-scope-chaos/workflow.yaml index e676cc6..539861e 100644 --- a/workflows/namespaced-scope-chaos/workflow.yaml +++ b/workflows/namespaced-scope-chaos/workflow.yaml @@ -2,6 +2,8 @@ apiVersion: argoproj.io/v1alpha1 kind: Workflow metadata: generateName: argowf-chaos-hello-world-pod-delete- + labels: + subject: "{{workflow.parameters.adminModeNamespace}}_hello-world" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -123,6 +125,8 @@ spec: metadata: name: pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.adminModeNamespace}}_hello-world" spec: appinfo: appns: {{workflow.parameters.adminModeNamespace}} diff --git a/workflows/namespaced-scope-chaos/workflow_cron.yaml b/workflows/namespaced-scope-chaos/workflow_cron.yaml index 113c50f..173aa41 100644 --- a/workflows/namespaced-scope-chaos/workflow_cron.yaml +++ b/workflows/namespaced-scope-chaos/workflow_cron.yaml @@ -2,6 +2,8 @@ apiVersion: argoproj.io/v1alpha1 kind: CronWorkflow metadata: name: argo-chaos-hello-world-pod-delete-cron-wf + labels: + subject: "{{workflow.parameters.adminModeNamespace}}_hello-world" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -127,6 +129,8 @@ spec: metadata: name: pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.adminModeNamespace}}_hello-world" spec: appinfo: appns: {{workflow.parameters.adminModeNamespace}} diff --git a/workflows/node-cpu-hog/workflow.yaml b/workflows/node-cpu-hog/workflow.yaml index ac1c8d6..bb8cbf8 100644 --- a/workflows/node-cpu-hog/workflow.yaml +++ b/workflows/node-cpu-hog/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-node-cpu-hog- namespace: litmus + labels: + subject: "{{workflow.parameters.context}}" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: context + value: "node-cpu-hog_infra" templates: - name: argowf-chaos steps: @@ -120,6 +124,8 @@ spec: metadata: name: kube-proxy-node-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.context}}" spec: jobCleanUpPolicy: retain engineState: 'active' diff --git a/workflows/node-cpu-hog/workflow_cron.yaml b/workflows/node-cpu-hog/workflow_cron.yaml index d6e4c1e..8352de0 100644 --- a/workflows/node-cpu-hog/workflow_cron.yaml +++ b/workflows/node-cpu-hog/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argo-chaos-node-cpu-cron-wf namespace: litmus + labels: + subject: "{{workflow.parameters.context}}" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: context + value: "node-cpu-hog_infra" templates: - name: argowf-chaos steps: @@ -124,6 +128,8 @@ spec: metadata: name: kube-proxy-node-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.context}}" spec: jobCleanUpPolicy: retain engineState: 'active' diff --git a/workflows/node-memory-hog/workflow.yaml b/workflows/node-memory-hog/workflow.yaml index a3e3cf6..fd27aa0 100644 --- a/workflows/node-memory-hog/workflow.yaml +++ b/workflows/node-memory-hog/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-node-memory-hog- namespace: litmus + labels: + subject: "{{workflow.parameters.context}}" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: context + value: "node-memory-hog_infra" templates: - name: argowf-chaos steps: @@ -120,6 +124,8 @@ spec: metadata: name: kube-proxy-node-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.context}}" spec: jobCleanUpPolicy: retain engineState: 'active' diff --git a/workflows/node-memory-hog/workflow_cron.yaml b/workflows/node-memory-hog/workflow_cron.yaml index c360080..48f9e9d 100644 --- a/workflows/node-memory-hog/workflow_cron.yaml +++ b/workflows/node-memory-hog/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argo-chaos-node-memory-cron-wf namespace: litmus + labels: + subject: "{{workflow.parameters.context}}" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: context + value: "node-memory-hog_infra" templates: - name: argowf-chaos steps: @@ -116,6 +120,8 @@ spec: metadata: name: kube-proxy-node-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.context}}" spec: jobCleanUpPolicy: retain engineState: 'active' diff --git a/workflows/pod-cpu-hog/workflow.yaml b/workflows/pod-cpu-hog/workflow.yaml index 2710358..f9a59bd 100644 --- a/workflows/pod-cpu-hog/workflow.yaml +++ b/workflows/pod-cpu-hog/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-pod-cpu-hog- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" templates: - name: argowf-chaos steps: @@ -114,6 +118,8 @@ spec: metadata: name: kube-proxy-pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/pod-cpu-hog/workflow_cron.yaml b/workflows/pod-cpu-hog/workflow_cron.yaml index d3a0af1..75930a2 100644 --- a/workflows/pod-cpu-hog/workflow_cron.yaml +++ b/workflows/pod-cpu-hog/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argo-chaos-pod-cpu-cron-wf namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" templates: - name: argowf-chaos steps: @@ -118,6 +122,8 @@ spec: metadata: name: kube-proxy-pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/pod-delete/workflow.yaml b/workflows/pod-delete/workflow.yaml index dfd3bf1..4c39419 100644 --- a/workflows/pod-delete/workflow.yaml +++ b/workflows/pod-delete/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-pod-delete- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" templates: - name: argowf-chaos steps: @@ -120,6 +124,8 @@ spec: metadata: name: kube-proxy-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/pod-delete/workflow_cron.yaml b/workflows/pod-delete/workflow_cron.yaml index 33e57d9..1311b4e 100644 --- a/workflows/pod-delete/workflow_cron.yaml +++ b/workflows/pod-delete/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argo-chaos-pod-delete-cron-wf namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" templates: - name: argowf-chaos steps: @@ -124,6 +128,8 @@ spec: metadata: name: kube-proxy-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/pod-memory-hog/workflow.yaml b/workflows/pod-memory-hog/workflow.yaml index db2c9fc..eba531a 100644 --- a/workflows/pod-memory-hog/workflow.yaml +++ b/workflows/pod-memory-hog/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-pod-memory-hog- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" templates: - name: argowf-chaos steps: @@ -115,6 +119,8 @@ spec: metadata: name: kube-proxy-pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/pod-memory-hog/workflow_cron.yaml b/workflows/pod-memory-hog/workflow_cron.yaml index 3e60518..9f2100f 100644 --- a/workflows/pod-memory-hog/workflow_cron.yaml +++ b/workflows/pod-memory-hog/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argo-chaos-pod-memory-cron-wf namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "kube-system" templates: - name: argowf-chaos steps: @@ -119,6 +123,8 @@ spec: metadata: name: kube-proxy-pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_kube-proxy" spec: appinfo: appns: kube-system diff --git a/workflows/podtato-head/workflow.yaml b/workflows/podtato-head/workflow.yaml index 1ce9bc7..40f1fa5 100644 --- a/workflows/podtato-head/workflow.yaml +++ b/workflows/podtato-head/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-podtato-head-chaos- namespace: litmus + labels: + subject : "{{workflow.parameters.adminModeNamespace}}_podtato-head" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -34,7 +36,7 @@ spec: - name: install-chaos-experiments container: - image: alpine/k8s:1.18.2 + image: litmuschaos/k8s:latest command: [sh, -c] args: - "kubectl apply -f https://hub.litmuschaos.io/api/chaos/master?file=charts/generic/experiments.yaml -n @@ -52,6 +54,8 @@ spec: metadata: name: podtato-head-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.adminModeNamespace}}_podtato-head" spec: appinfo: appns: {{workflow.parameters.adminModeNamespace}} diff --git a/workflows/podtato-head/workflow_cron.yaml b/workflows/podtato-head/workflow_cron.yaml index 1f92d57..376f6d8 100644 --- a/workflows/podtato-head/workflow_cron.yaml +++ b/workflows/podtato-head/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: name: argowf-podtato-head-chaos-cron-wf namespace: litmus + labels: + subject : "{{workflow.parameters.adminModeNamespace}}_podtato-head" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -38,7 +40,7 @@ spec: - name: install-chaos-experiments container: - image: alpine/k8s:1.18.2 + image: litmuschaos/k8s:latest command: [sh, -c] args: - "kubectl apply -f https://hub.litmuschaos.io/api/chaos/master?file=charts/generic/experiments.yaml -n @@ -56,6 +58,8 @@ spec: metadata: name: podtato-head-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.adminModeNamespace}}_podtato-head" spec: appinfo: appns: {{workflow.parameters.adminModeNamespace}} diff --git a/workflows/sock-shop-demo/usingCmdProbe/workflow.yaml b/workflows/sock-shop-demo/usingCmdProbe/workflow.yaml index 886b7bf..9653591 100644 --- a/workflows/sock-shop-demo/usingCmdProbe/workflow.yaml +++ b/workflows/sock-shop-demo/usingCmdProbe/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-sock-shop-resiliency- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_sock-shop" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "sock-shop" templates: - name: argowf-chaos steps: @@ -64,6 +68,8 @@ spec: metadata: name: pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_carts" spec: appinfo: appns: 'sock-shop' @@ -134,6 +140,8 @@ spec: metadata: name: pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_orders" spec: appinfo: appns: 'sock-shop' @@ -202,6 +210,8 @@ spec: metadata: name: catalogue-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue" spec: appinfo: appns: 'sock-shop' @@ -274,6 +284,8 @@ spec: metadata: name: pod-network-loss-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_user-db" spec: appinfo: appns: 'sock-shop' @@ -348,6 +360,8 @@ spec: metadata: name: catalogue-disk-fill namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue-db" spec: appinfo: appns: 'sock-shop' diff --git a/workflows/sock-shop-demo/usingCmdProbe/workflow_cron.yaml b/workflows/sock-shop-demo/usingCmdProbe/workflow_cron.yaml index 24369f3..e7f9fb7 100644 --- a/workflows/sock-shop-demo/usingCmdProbe/workflow_cron.yaml +++ b/workflows/sock-shop-demo/usingCmdProbe/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: generateName: argowf-chaos-sock-shop-resiliency-cron-wf- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_sock-shop" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "sock-shop" templates: - name: argowf-chaos steps: @@ -55,7 +59,7 @@ spec: args: - "kubectl apply -f https://hub.litmuschaos.io/api/chaos/master?file=charts/generic/experiments.yaml -n {{workflow.parameters.adminModeNamespace}} ; sleep 30" - + - name: pod-cpu-hog inputs: artifacts: @@ -68,6 +72,8 @@ spec: metadata: name: pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_carts" spec: appinfo: appns: 'sock-shop' @@ -138,6 +144,8 @@ spec: metadata: name: pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_orders" spec: appinfo: appns: 'sock-shop' @@ -206,6 +214,8 @@ spec: metadata: name: catalogue-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue" spec: appinfo: appns: 'sock-shop' @@ -278,6 +288,8 @@ spec: metadata: name: pod-network-loss-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_user-db" spec: appinfo: appns: 'sock-shop' @@ -352,6 +364,8 @@ spec: metadata: name: catalogue-disk-fill namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue-db" spec: appinfo: appns: 'sock-shop' diff --git a/workflows/sock-shop-demo/usingPromProbe/workflow.yaml b/workflows/sock-shop-demo/usingPromProbe/workflow.yaml index fb51dcf..162b5e6 100644 --- a/workflows/sock-shop-demo/usingPromProbe/workflow.yaml +++ b/workflows/sock-shop-demo/usingPromProbe/workflow.yaml @@ -3,6 +3,8 @@ kind: Workflow metadata: generateName: argowf-chaos-sock-shop-resiliency- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_sock-shop" spec: entrypoint: argowf-chaos serviceAccountName: argo-chaos @@ -13,6 +15,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "sock-shop" templates: - name: argowf-chaos steps: @@ -64,6 +68,8 @@ spec: metadata: name: pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_carts" spec: appinfo: appns: 'sock-shop' @@ -132,6 +138,8 @@ spec: metadata: name: pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_orders" spec: appinfo: appns: 'sock-shop' @@ -198,6 +206,8 @@ spec: metadata: name: catalogue-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue" spec: appinfo: appns: 'sock-shop' @@ -268,6 +278,8 @@ spec: metadata: name: pod-network-loss-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_user-db" spec: appinfo: appns: 'sock-shop' @@ -341,6 +353,8 @@ spec: metadata: name: catalogue-disk-fill namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue-db" spec: appinfo: appns: 'sock-shop' diff --git a/workflows/sock-shop-demo/usingPromProbe/workflow_cron.yaml b/workflows/sock-shop-demo/usingPromProbe/workflow_cron.yaml index 72b40e8..1033117 100644 --- a/workflows/sock-shop-demo/usingPromProbe/workflow_cron.yaml +++ b/workflows/sock-shop-demo/usingPromProbe/workflow_cron.yaml @@ -3,6 +3,8 @@ kind: CronWorkflow metadata: generateName: argowf-chaos-sock-shop-resiliency-cron-wf- namespace: litmus + labels: + subject: "{{workflow.parameters.appNamespace}}_sock-shop" spec: schedule: "0 * * * *" concurrencyPolicy: "Forbid" @@ -17,6 +19,8 @@ spec: parameters: - name: adminModeNamespace value: "litmus" + - name: appNamespace + value: "sock-shop" templates: - name: argowf-chaos steps: @@ -68,6 +72,8 @@ spec: metadata: name: pod-cpu-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_carts" spec: appinfo: appns: 'sock-shop' @@ -136,6 +142,8 @@ spec: metadata: name: pod-memory-hog-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_orders" spec: appinfo: appns: 'sock-shop' @@ -202,6 +210,8 @@ spec: metadata: name: catalogue-pod-delete-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.env.appNamespace}}_catalogue" spec: appinfo: appns: 'sock-shop' @@ -272,6 +282,8 @@ spec: metadata: name: pod-network-loss-chaos namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_user-db" spec: appinfo: appns: 'sock-shop' @@ -345,6 +357,8 @@ spec: metadata: name: catalogue-disk-fill namespace: {{workflow.parameters.adminModeNamespace}} + labels: + context: "{{workflow.parameters.appNamespace}}_catalogue-db" spec: appinfo: appns: 'sock-shop' @@ -423,4 +437,4 @@ spec: args: [ "kubectl delete chaosengine pod-memory-hog-chaos pod-cpu-hog-chaos catalogue-pod-delete-chaos pod-network-loss-chaos -n {{workflow.parameters.adminModeNamespace}}", - ] \ No newline at end of file + ]