From 00570a79dc557a71c13850e301b31e700ffc69b0 Mon Sep 17 00:00:00 2001
From: Udit Gaurav <35391335+uditgaurav@users.noreply.github.com>
Date: Wed, 16 Jun 2021 03:32:25 +0530
Subject: [PATCH] Chore(stress-chaos): Add stress chaos charts (#475)

Signed-off-by: udit <udit@chaosnative.com>

Co-authored-by: Shubham Chaudhary <shubham.chaudhary@mayadata.io>
---
 .../generic/generic.chartserviceversion.yaml  |   2 +
 charts/generic/generic.package.yaml           |   6 ++
 charts/generic/icons/pod-cpu-hog-exec.png     | Bin 0 -> 2078 bytes
 charts/generic/icons/pod-memory-hog-exec.png  | Bin 0 -> 1516 bytes
 .../ansible => pod-cpu-hog-exec}/engine.yaml  |  14 +--
 .../experiment.yaml                           |  49 +++++++---
 .../pod-cpu-hog-exec.chartserviceversion.yaml |  47 +++++++++
 charts/generic/pod-cpu-hog-exec/rbac-psp.yaml |  61 ++++++++++++
 charts/generic/pod-cpu-hog-exec/rbac.yaml     |  57 +++++++++++
 charts/generic/pod-cpu-hog/ansible/rbac.yaml  |  39 --------
 charts/generic/pod-cpu-hog/engine.yaml        |   6 +-
 charts/generic/pod-cpu-hog/experiment.yaml    |  12 ++-
 .../pod-cpu-hog.chartserviceversion.yaml      |  15 +--
 charts/generic/pod-io-stress/experiment.yaml  |  13 ++-
 .../engine.yaml                               |  14 +--
 .../pod-memory-hog-exec/experiment.yaml       |  89 ++++++++++++++++++
 ...d-memory-hog-exec.chartserviceversion.yaml |  47 +++++++++
 .../generic/pod-memory-hog-exec/rbac-psp.yaml |  61 ++++++++++++
 charts/generic/pod-memory-hog-exec/rbac.yaml  |  57 +++++++++++
 .../pod-memory-hog/ansible/experiment.yaml    |  73 --------------
 .../generic/pod-memory-hog/ansible/rbac.yaml  |  39 --------
 charts/generic/pod-memory-hog/engine.yaml     |   4 +-
 charts/generic/pod-memory-hog/experiment.yaml |   8 +-
 .../pod-memory-hog.chartserviceversion.yaml   |  13 +--
 scripts/combine-all-crs.go                    |   2 +-
 25 files changed, 511 insertions(+), 217 deletions(-)
 create mode 100644 charts/generic/icons/pod-cpu-hog-exec.png
 create mode 100644 charts/generic/icons/pod-memory-hog-exec.png
 rename charts/generic/{pod-cpu-hog/ansible => pod-cpu-hog-exec}/engine.yaml (60%)
 rename charts/generic/{pod-cpu-hog/ansible => pod-cpu-hog-exec}/experiment.yaml (53%)
 create mode 100644 charts/generic/pod-cpu-hog-exec/pod-cpu-hog-exec.chartserviceversion.yaml
 create mode 100644 charts/generic/pod-cpu-hog-exec/rbac-psp.yaml
 create mode 100644 charts/generic/pod-cpu-hog-exec/rbac.yaml
 delete mode 100644 charts/generic/pod-cpu-hog/ansible/rbac.yaml
 rename charts/generic/{pod-memory-hog/ansible => pod-memory-hog-exec}/engine.yaml (60%)
 create mode 100644 charts/generic/pod-memory-hog-exec/experiment.yaml
 create mode 100644 charts/generic/pod-memory-hog-exec/pod-memory-hog-exec.chartserviceversion.yaml
 create mode 100644 charts/generic/pod-memory-hog-exec/rbac-psp.yaml
 create mode 100644 charts/generic/pod-memory-hog-exec/rbac.yaml
 delete mode 100644 charts/generic/pod-memory-hog/ansible/experiment.yaml
 delete mode 100644 charts/generic/pod-memory-hog/ansible/rbac.yaml

diff --git a/charts/generic/generic.chartserviceversion.yaml b/charts/generic/generic.chartserviceversion.yaml
index 11a6d61..7e28324 100644
--- a/charts/generic/generic.chartserviceversion.yaml
+++ b/charts/generic/generic.chartserviceversion.yaml
@@ -37,6 +37,8 @@ spec:
     - node-restart
     - pod-dns-error
     - pod-dns-spoof
+    - pod-cpu-hog-exec
+    - pod-memory-hog-exec
 
   keywords:
     - Kubernetes
diff --git a/charts/generic/generic.package.yaml b/charts/generic/generic.package.yaml
index 5d6fcec..2e886e7 100644
--- a/charts/generic/generic.package.yaml
+++ b/charts/generic/generic.package.yaml
@@ -72,3 +72,9 @@ experiments:
   - name: pod-dns-spoof
     CSV: pod-dns-spoof.chartserviceversion.yaml
     desc: "pod-dns-spoof"
+  - name: pod-cpu-hog-exec
+    CSV: pod-cpu-hog-exec.chartserviceversion.yaml
+    desc: "pod-cpu-hog-exec"
+  - name: pod-memory-hog-exec
+    CSV: pod-memory-hog-exec.chartserviceversion.yaml
+    desc: "pod-memory-hog-exec"
diff --git a/charts/generic/icons/pod-cpu-hog-exec.png b/charts/generic/icons/pod-cpu-hog-exec.png
new file mode 100644
index 0000000000000000000000000000000000000000..c152ab51866cfcfcf610aa67ad96de484026662b
GIT binary patch
literal 2078
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
IM6N<$g5-VL<^TWy

literal 0
HcmV?d00001

diff --git a/charts/generic/icons/pod-memory-hog-exec.png b/charts/generic/icons/pod-memory-hog-exec.png
new file mode 100644
index 0000000000000000000000000000000000000000..e49a4686765c58d07b0b35237bd14ac161c9a733
GIT binary patch
literal 1516
zcmV<I1rz#-P)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1%XLKK~#7F?VVju
z990;{pFw07tuD1)*kH?UW7DK*q((y%jhHs^r57etZS+DD@f+wTC|-M^z3@hj+BDvn
z7-}Su(hHT1?S(Hvlr%wzyIYDds{*Ca-L@${|Jhx-Z1-hm&dfPOIltsE%kq}}@tpHK
zbIzGrgQ~E$w${dnH@O|=_87MWZB53wrMR6j4C7R_Z!jvKV0p**@ENx@(v*|pHc%<D
zsr(a`_dXv6Nz1E7g4^fp=tTLG>k(M|!T@RP@Bv5SJ9uCTWO@Bm=(ZaByu=dElmz}o
zTQ^a-Ws%#Sdy3K5Pa3C$xy>Vq^pVCbhaoUQ8n+xYxC^h5#x+f(5kd<TL<<x|3lu~P
z6hsRYq?sg>zLX;~o2R+#bu#Dkl*`|ur7Jhrza9!TQQL#f6p1ubM>IrTyIU!~J4``E
zN*xGklT#}+KCw)B7UmR4-M9CC>OSy5;AHwL5aN;-{-X>Zy&}TV+56OXOJ)%8Md0Gn
zO&U6DdMd6Gh<yFkPHKxtAB8sHxxk-(U7~Z}{Y$byH1<BZomAnOz+CQ@6?KzSt0bF_
zXbZj47gG|Ao(M#j{p#yEn&-@_3RPWNxDG_*eevb2Qh5NS(4W&QBpYFYkXK&EsRCnR
z&*Kr2jZnNN&o2l^-XVU`PxFfpbFG)Ybd83FvyT5EDiew82t-kwys$tbpq6{~$PP;$
zi1S&;8?SXb`4!5uuq%NW_Yi%eJbGZ;9nT>dw70jA9aPH$t^}gi^J3hqby`=7$a(}p
z9&juWC5vd+ErDU6+V5|41``x{z;P0p^srPw(T%efWKYy@ICmZzHtYUOBYElRWm>%|
z);snewExd>Tu6WTaYk9$QcK=H^EnzFxl9*-Td<laJ3Cq}iO)RW*-)k<frt>)eJZFW
zFFmzPznnM8FLuUSEs?cw)P*spr-FLjc6cyN$&tUwPwEMDltj`q*GM)&N*L9!Ef7=h
zrYZM)H|X+!?Jm5ybc1AKSKiT=<J`p_CRNxLC^PdqiM;qDg{l1&E?qKQ!eC4kEn|9-
zeY+o`Xsq%2i|s5t{>L&;m}bduoOWBt`uRtbGjWz5d)rG;!t}n-Nl`9qYGHc}lo5e$
z#=OyySxTOprPY-ig$>Idwu|En^wE10b^pHYE*uW~y9VFI%av{tMtb^+C&jZ{Y+DJn
z_$x4DErF^N;TE-Pf)$je$ecuCl+P6QcW;7Kxj8dWpPs%<G7zc%WKSm8j=;9ay(9~#
zkyx5c7(F{{Jr>2c$%Ic%&qzHRu@i}#YBC|dt5vE%JCV4lCKLAUy^mxAi9ycJjs#-W
zEEMv$oT)~TB|4swR{3J8jfq}l-A2?)B#s4QS_{+qZZ=AKLC~hS9QQ{oIUZ85g`z~z
zy0fbRt>=k|wE(V)AW3v35K;Kz(I}}TC=y+#RAl5Hg<Tm0L84Gi^4yUf)-;q#R7(^t
z>W=rtl#Yi$r9@$Y7!R=}&F+pWzrd0Mc8$r#yG`a?7h+$FicRKSyTWw*Sj^V0F0b+Y
zG6&h+2{kD;X{y4P3vI9f_06{?WoG=l&<0V5vl3JTD)IGFFKZhxN2Hf4dblP8h5TK8
zsaGY~JpTK{RqN<R=Ix6Ow<(XfN~GVl0}{>bb?b=TsQHS^T~QK2SVwz^Vw~CAIpXkG
zMS`${zU_%1`igZyv_L_$KtZ%XL9{?Yv_L^1Fhv@-j6vWSY21>Az#mBCmO-O<*K*v1
zR^L0?87ads_B8Pa+>Q1v(l})RAFM2l`yun;Bx&sOZt0fr8}6mg-FbiyCrDF|lPvG;
z(kIp4jG&(i5)-5;#~SL2y>%U<)^`_0;vUlpD!e7eRwPA*GVgnCr;7Pv1OEfjsCZ#C
S2e4KE0000<MNUMnLSTa5`p8=V

literal 0
HcmV?d00001

diff --git a/charts/generic/pod-cpu-hog/ansible/engine.yaml b/charts/generic/pod-cpu-hog-exec/engine.yaml
similarity index 60%
rename from charts/generic/pod-cpu-hog/ansible/engine.yaml
rename to charts/generic/pod-cpu-hog-exec/engine.yaml
index 12fa239..f710fce 100644
--- a/charts/generic/pod-cpu-hog/ansible/engine.yaml
+++ b/charts/generic/pod-cpu-hog-exec/engine.yaml
@@ -6,28 +6,20 @@ metadata:
 spec:
   # It can be active/stop
   engineState: 'active'
-  #ex. values: ns1:name=percona,ns2:run=nginx 
-  auxiliaryAppInfo: ''
   appinfo:
     appns: 'default'
     applabel: 'app=nginx'
     appkind: 'deployment'
-  chaosServiceAccount: pod-cpu-hog-sa
+  chaosServiceAccount: pod-cpu-hog-exec-sa
   experiments:
-    - name: pod-cpu-hog
+    - name: pod-cpu-hog-exec
       spec:
         components:
           env:
-            # Provide name of target container
-            # where chaos has to be injected
-            - name: TARGET_CONTAINER
-              value: 'nginx'
-
             #number of cpu cores to be consumed
             #verify the resources the app has been launched with
             - name: CPU_CORES
               value: '1'
 
             - name: TOTAL_CHAOS_DURATION
-              value: '60' # in seconds
-            
\ No newline at end of file
+              value: '60' # in seconds
\ No newline at end of file
diff --git a/charts/generic/pod-cpu-hog/ansible/experiment.yaml b/charts/generic/pod-cpu-hog-exec/experiment.yaml
similarity index 53%
rename from charts/generic/pod-cpu-hog/ansible/experiment.yaml
rename to charts/generic/pod-cpu-hog-exec/experiment.yaml
index 2dc1181..1152988 100644
--- a/charts/generic/pod-cpu-hog/ansible/experiment.yaml
+++ b/charts/generic/pod-cpu-hog-exec/experiment.yaml
@@ -4,9 +4,9 @@ description:
     Injects cpu consumption on pods belonging to an app deployment
 kind: ChaosExperiment
 metadata:
-  name: pod-cpu-hog
+  name: pod-cpu-hog-exec
   labels:
-    name: pod-cpu-hog
+    name: pod-cpu-hog-exec
     app.kubernetes.io/part-of: litmus
     app.kubernetes.io/component: chaosexperiment
     app.kubernetes.io/version: latest
@@ -17,12 +17,23 @@ spec:
       - apiGroups:
           - ""
           - "batch"
+          - "apps"
+          - "apps.openshift.io"
+          - "argoproj.io"
           - "litmuschaos.io"
         resources:
           - "jobs"
           - "pods"
           - "pods/log"
           - "events"
+          - "replicationcontrollers"
+          - "deployments"
+          - "statefulsets"
+          - "daemonsets"
+          - "replicasets"
+          - "deploymentconfigs"
+          - "rollouts"
+          - "pods/exec"
           - "chaosengines"
           - "chaosexperiments"
           - "chaosresults"
@@ -33,37 +44,45 @@ spec:
           - "patch"
           - "update"
           - "delete"
-    image: "litmuschaos/ansible-runner:latest"
+          - "deletecollection"
+    image: "litmuschaos/go-runner:ci"
     imagePullPolicy: Always
     args:
     - -c
-    - ansible-playbook ./experiments/generic/pod_cpu_hog/pod_cpu_hog_ansible_logic.yml -i /etc/ansible/hosts -vv; exit 0
+    - ./experiments -name pod-cpu-hog-exec
     command:
     - /bin/bash
     env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: 'default'
-
-    - name: TARGET_CONTAINER
-      value: ''
+    - name: TOTAL_CHAOS_DURATION
+      value: '60'
 
+    ## Number of CPU cores to stress
     - name: CPU_CORES
       value: '1'
 
-    - name: TOTAL_CHAOS_DURATION
-      value: '60' # in seconds
+    ## Percentage of total pods to target
+    - name: PODS_AFFECTED_PERC
+      value: ''
 
-    # Period to wait before injection of chaos in sec
+    ## Period to wait before and after injection of chaos in sec
     - name: RAMP_TIME
       value: ''
 
+    ## env var that describes the library used to execute the chaos
+    ## default: litmus. Supported values: litmus    
     - name: LIB
       value: 'litmus'
 
-    - name: LIB_IMAGE
-      value: 'litmuschaos/app-cpu-stress:latest' 
+    - name: TARGET_PODS
+      value: ''
+
+    ## it defines the sequence of chaos execution for multiple target pods
+    ## supported values: serial, parallel
+    - name: SEQUENCE
+      value: 'parallel'
+      
     labels:
-      name: pod-cpu-hog
+      name: pod-cpu-hog-exec
       app.kubernetes.io/part-of: litmus
       app.kubernetes.io/component: experiment-job
       app.kubernetes.io/version: latest
diff --git a/charts/generic/pod-cpu-hog-exec/pod-cpu-hog-exec.chartserviceversion.yaml b/charts/generic/pod-cpu-hog-exec/pod-cpu-hog-exec.chartserviceversion.yaml
new file mode 100644
index 0000000..94ee3c9
--- /dev/null
+++ b/charts/generic/pod-cpu-hog-exec/pod-cpu-hog-exec.chartserviceversion.yaml
@@ -0,0 +1,47 @@
+apiVersion: litmuchaos.io/v1alpha1
+kind: ChartServiceVersion
+metadata:
+  createdAt: 2021-06-16T10:28:08Z
+  name: pod-cpu-hog-exec
+  version: 0.1.0
+  annotations:
+    categories: Kubernetes
+    vendor: CNCF
+    support: https://slack.kubernetes.io/
+spec:
+  displayName: pod-cpu-hog-exec
+  categoryDescription: |
+    pod-cpu-hog-exec contains chaos to consume CPU resouces of specified containers in Kubernetes pods.  
+    - Causes high CPU resource consumption utilizing one or more cores by triggering md5sum commands
+    - The application pod should be healthy once chaos is stopped. Expectation is that service-requests should be served despite chaos.
+  keywords:
+    - Kubernetes
+    - CPU
+  platforms:
+    - GKE
+    - Packet(Kubeadm)
+    - Minikube
+    - EKS
+    - AKS
+    - Kind
+  maturity: alpha
+  maintainers:
+    - name: ksatchit
+      email: karthik@chaosnative.com
+  minKubeVersion: 1.12.0
+  provider:
+    name: ChaosNative
+  labels:
+    app.kubernetes.io/component: chartserviceversion
+    app.kubernetes.io/version: latest
+  links:
+    - name: Source Code
+      url: https://github.com/litmuschaos/litmus-go/tree/master/experiments/generic/pod-cpu-hog-exec
+    - name: Documentation
+      url: https://docs.litmuschaos.io/docs/pod-cpu-hog-exec/
+    - name: Video
+      url: https://www.youtube.com/watch?v=MBGSPmZKb2I
+  icon:
+    - base64data: ""
+      mediatype: ""
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod-cpu-hog-exec/experiment.yaml 
diff --git a/charts/generic/pod-cpu-hog-exec/rbac-psp.yaml b/charts/generic/pod-cpu-hog-exec/rbac-psp.yaml
new file mode 100644
index 0000000..0a9ae54
--- /dev/null
+++ b/charts/generic/pod-cpu-hog-exec/rbac-psp.yaml
@@ -0,0 +1,61 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: pod-cpu-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-cpu-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pod-cpu-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-cpu-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+rules:
+- apiGroups: [""]
+  resources: ["pods","events"]
+  verbs: ["create","list","get","patch","update","delete","deletecollection"]
+- apiGroups: [""]
+  resources: ["pods/exec","pods/log","replicationcontrollers"]
+  verbs: ["create","list","get"]
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["create","list","get","delete","deletecollection"]
+- apiGroups: ["apps"]
+  resources: ["deployments","statefulsets","daemonsets","replicasets"]
+  verbs: ["list","get"]
+- apiGroups: ["apps.openshift.io"]
+  resources: ["deploymentconfigs"]
+  verbs: ["list","get"]
+- apiGroups: ["argoproj.io"]
+  resources: ["rollouts"]
+  verbs: ["list","get"]
+- apiGroups: ["litmuschaos.io"]
+  resources: ["chaosengines","chaosexperiments","chaosresults"]
+  verbs: ["create","list","get","patch","update"]
+- apiGroups: ["policy"]
+  resources: ["podsecuritypolicies"]
+  verbs: ["use"]
+  resourceNames: ["litmus"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pod-cpu-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-cpu-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: pod-cpu-hog-exec-sa
+subjects:
+- kind: ServiceAccount
+  name: pod-cpu-hog-exec-sa
+  namespace: default
diff --git a/charts/generic/pod-cpu-hog-exec/rbac.yaml b/charts/generic/pod-cpu-hog-exec/rbac.yaml
new file mode 100644
index 0000000..7f84c71
--- /dev/null
+++ b/charts/generic/pod-cpu-hog-exec/rbac.yaml
@@ -0,0 +1,57 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: pod-cpu-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-cpu-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pod-cpu-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-cpu-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+rules:
+- apiGroups: [""]
+  resources: ["pods","events"]
+  verbs: ["create","list","get","patch","update","delete","deletecollection"]
+- apiGroups: [""]
+  resources: ["pods/exec","pods/log","replicationcontrollers"]
+  verbs: ["create","list","get"]
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["create","list","get","delete","deletecollection"]
+- apiGroups: ["apps"]
+  resources: ["deployments","statefulsets","daemonsets","replicasets"]
+  verbs: ["list","get"]
+- apiGroups: ["apps.openshift.io"]
+  resources: ["deploymentconfigs"]
+  verbs: ["list","get"]
+- apiGroups: ["argoproj.io"]
+  resources: ["rollouts"]
+  verbs: ["list","get"]
+- apiGroups: ["litmuschaos.io"]
+  resources: ["chaosengines","chaosexperiments","chaosresults"]
+  verbs: ["create","list","get","patch","update"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pod-cpu-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-cpu-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: pod-cpu-hog-exec-sa
+subjects:
+- kind: ServiceAccount
+  name: pod-cpu-hog-exec-sa
+  namespace: default
diff --git a/charts/generic/pod-cpu-hog/ansible/rbac.yaml b/charts/generic/pod-cpu-hog/ansible/rbac.yaml
deleted file mode 100644
index 011a55f..0000000
--- a/charts/generic/pod-cpu-hog/ansible/rbac.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: pod-cpu-hog-sa
-  namespace: default
-  labels:
-    name: pod-cpu-hog-sa
-    app.kubernetes.io/part-of: litmus
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: pod-cpu-hog-sa
-  namespace: default
-  labels:
-    name: pod-cpu-hog-sa
-    app.kubernetes.io/part-of: litmus
-rules:
-- apiGroups: ["","litmuschaos.io","batch"]
-  resources: ["pods","jobs","events","pods/log","chaosengines","chaosexperiments","chaosresults"]
-  verbs: ["create","list","get","patch","update","delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: pod-cpu-hog-sa
-  namespace: default
-  labels:
-    name: pod-cpu-hog-sa
-    app.kubernetes.io/part-of: litmus
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: pod-cpu-hog-sa
-subjects:
-- kind: ServiceAccount
-  name: pod-cpu-hog-sa
-  namespace: default
diff --git a/charts/generic/pod-cpu-hog/engine.yaml b/charts/generic/pod-cpu-hog/engine.yaml
index 0aaf702..4df7272 100644
--- a/charts/generic/pod-cpu-hog/engine.yaml
+++ b/charts/generic/pod-cpu-hog/engine.yaml
@@ -17,10 +17,8 @@ spec:
       spec:
         components:
           env:
-            #number of cpu cores to be consumed
-            #verify the resources the app has been launched with
             - name: CPU_CORES
-              value: '1'
+              value: '1'         
 
             - name: TOTAL_CHAOS_DURATION
-              value: '60' # in seconds
\ No newline at end of file
+              value: '60' # in seconds
diff --git a/charts/generic/pod-cpu-hog/experiment.yaml b/charts/generic/pod-cpu-hog/experiment.yaml
index 563a2d4..b4172dd 100644
--- a/charts/generic/pod-cpu-hog/experiment.yaml
+++ b/charts/generic/pod-cpu-hog/experiment.yaml
@@ -45,7 +45,7 @@ spec:
           - "update"
           - "delete"
           - "deletecollection"
-    image: "litmuschaos/go-runner:latest"
+    image: "litmuschaos/go-runner:ci"
     imagePullPolicy: Always
     args:
     - -c
@@ -58,7 +58,7 @@ spec:
 
     ## Number of CPU cores to stress
     - name: CPU_CORES
-      value: '1'
+      value: '1' 
 
     ## Percentage of total pods to target
     - name: PODS_AFFECTED_PERC
@@ -75,11 +75,15 @@ spec:
 
     ## It is used in pumba lib only    
     - name: LIB_IMAGE
-      value: 'litmuschaos/go-runner:latest'  
+      value: 'litmuschaos/go-runner:ci'  
 
     ## It is used in pumba lib only    
     - name: STRESS_IMAGE
-      value: 'alexeiled/stress-ng:latest-ubuntu'  
+      value: 'alexeiled/stress-ng:latest-ubuntu'
+
+    ## provide the cluster runtime
+    - name: CONTAINER_RUNTIME
+      value: 'docker'        
 
     # provide the socket file path
     # it is used in pumba lib
diff --git a/charts/generic/pod-cpu-hog/pod-cpu-hog.chartserviceversion.yaml b/charts/generic/pod-cpu-hog/pod-cpu-hog.chartserviceversion.yaml
index 68c3b91..7d6c997 100644
--- a/charts/generic/pod-cpu-hog/pod-cpu-hog.chartserviceversion.yaml
+++ b/charts/generic/pod-cpu-hog/pod-cpu-hog.chartserviceversion.yaml
@@ -1,9 +1,9 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  createdAt: 2019-01-07T10:28:08Z
+  createdAt: 2021-06-16T10:28:08Z
   name: pod-cpu-hog
-  version: 0.1.8
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
@@ -11,8 +11,9 @@ metadata:
 spec:
   displayName: pod-cpu-hog
   categoryDescription: |
-    Pod-CPU-Hog contains chaos to consume CPU resouces of specified containers in Kubernetes pods.  
-    - Causes high CPU resource consumption utilizing one or more cores by triggering md5sum commands
+    Pod-CPU-Hog contains chaos to consume CPU resouces of specified containers in Kubernetes pods.    
+    - Causes CPU resource consumption on specified application containers using cgroups and litmus nsutil which consume CPU resources of the given target containers.
+    - It Can test the application's resilience to potential slowness/unavailability of some replicas due to high CPU load
     - The application pod should be healthy once chaos is stopped. Expectation is that service-requests should be served despite chaos.
   keywords:
     - Kubernetes
@@ -27,10 +28,12 @@ spec:
   maturity: alpha
   maintainers:
     - name: ksatchit
-      email: karthik.s@mayadata.io
+      email: karthik@chaosnative.com
+    - name: Udit Gaurav
+      email: udit@chaosnative.com
   minKubeVersion: 1.12.0
   provider:
-    name: Mayadata
+    name: ChaosNative
   labels:
     app.kubernetes.io/component: chartserviceversion
     app.kubernetes.io/version: latest
diff --git a/charts/generic/pod-io-stress/experiment.yaml b/charts/generic/pod-io-stress/experiment.yaml
index 3ef86fb..66119e2 100644
--- a/charts/generic/pod-io-stress/experiment.yaml
+++ b/charts/generic/pod-io-stress/experiment.yaml
@@ -46,7 +46,7 @@ spec:
           - "update"
           - "delete"
           - "deletecollection"
-    image: "litmuschaos/go-runner:latest"
+    image: "litmuschaos/go-runner:ci"
     imagePullPolicy: Always
     args:
     - -c
@@ -88,16 +88,19 @@ spec:
         value: ''
 
       # Provide the LIB here
-      # Only pumba supported
+      # support litmus and pumba
       - name: LIB
-        value: 'pumba'
+        value: 'litmus'
 
       # provide lib image
       - name: LIB_IMAGE
-        value: 'litmuschaos/go-runner:latest'
+        value: 'litmuschaos/go-runner:ci'
+
+      ## provide the cluster runtime
+      - name: CONTAINER_RUNTIME
+        value: 'docker'   
 
       # provide the socket file path
-      # it is used in pumba lib
       - name: SOCKET_PATH
         value: '/var/run/docker.sock'         
 
diff --git a/charts/generic/pod-memory-hog/ansible/engine.yaml b/charts/generic/pod-memory-hog-exec/engine.yaml
similarity index 60%
rename from charts/generic/pod-memory-hog/ansible/engine.yaml
rename to charts/generic/pod-memory-hog-exec/engine.yaml
index 9431487..fa6ca86 100644
--- a/charts/generic/pod-memory-hog/ansible/engine.yaml
+++ b/charts/generic/pod-memory-hog-exec/engine.yaml
@@ -6,28 +6,20 @@ metadata:
 spec:
   # It can be active/stop
   engineState: 'active'
-  #ex. values: ns1:name=percona,ns2:run=nginx 
-  auxiliaryAppInfo: ''
   appinfo:
     appns: 'default'
     applabel: 'app=nginx'
     appkind: 'deployment'
-  chaosServiceAccount: pod-memory-hog-sa
+  chaosServiceAccount: pod-memory-hog-exec-sa
   experiments:
-    - name: pod-memory-hog
+    - name: pod-memory-hog-exec
       spec:
         components:
           env:
-            # Provide name of target container
-            # where chaos has to be injected
-            - name: TARGET_CONTAINER
-              value: 'nginx'
-
             # Enter the amount of memory in megabytes to be consumed by the application pod
-            # default: 500 (Megabytes) 
             - name: MEMORY_CONSUMPTION
               value: '500'
 
             - name: TOTAL_CHAOS_DURATION
               value: '60' # in seconds
-            
+            
\ No newline at end of file
diff --git a/charts/generic/pod-memory-hog-exec/experiment.yaml b/charts/generic/pod-memory-hog-exec/experiment.yaml
new file mode 100644
index 0000000..a2f316f
--- /dev/null
+++ b/charts/generic/pod-memory-hog-exec/experiment.yaml
@@ -0,0 +1,89 @@
+---
+apiVersion: litmuschaos.io/v1alpha1
+description:
+  message: |
+    Injects memory consumption on pods belonging to an app deployment
+kind: ChaosExperiment
+metadata:
+  name: pod-memory-hog-exec
+  labels:
+    name: pod-memory-hog-exec
+    app.kubernetes.io/part-of: litmus
+    app.kubernetes.io/component: chaosexperiment
+    app.kubernetes.io/version: latest
+spec:
+  definition:
+    scope: Namespaced
+    permissions:
+      - apiGroups:
+          - ""
+          - "batch"
+          - "apps"
+          - "apps.openshift.io"
+          - "argoproj.io"
+          - "litmuschaos.io"
+        resources:
+          - "jobs"
+          - "pods"
+          - "pods/log"
+          - "replicationcontrollers"
+          - "deployments"
+          - "statefulsets"
+          - "daemonsets"
+          - "replicasets"
+          - "deploymentconfigs"
+          - "rollouts"
+          - "pods/exec"
+          - "events"
+          - "chaosengines"
+          - "chaosexperiments"
+          - "chaosresults"
+        verbs:
+          - "create"
+          - "list"
+          - "get"
+          - "patch"
+          - "update"
+          - "delete"
+          - "deletecollection"
+    image: "litmuschaos/go-runner:ci"
+    imagePullPolicy: Always
+    args:
+    - -c
+    - ./experiments -name pod-memory-hog-exec
+    command:
+    - /bin/bash
+    env:
+      - name: TOTAL_CHAOS_DURATION
+        value: '60'
+
+      ## enter the amount of memory in megabytes to be consumed by the application pod
+      - name: MEMORY_CONSUMPTION
+        value: '500'
+
+      ## percentage of total pods to target
+      - name: PODS_AFFECTED_PERC
+        value: ''
+
+      ## Period to wait before and after injection of chaos in sec
+      - name: RAMP_TIME
+        value: ''     
+
+      ## env var that describes the library used to execute the chaos
+      ## default: litmus. Supported values: litmus
+      - name: LIB
+        value: 'litmus'
+        
+      ## it defines the sequence of chaos execution for multiple target pods
+      ## supported values: serial, parallel
+      - name: SEQUENCE
+        value: 'parallel'
+
+      - name: TARGET_PODS
+        value: ''
+
+    labels:
+      name: pod-memory-hog-exec
+      app.kubernetes.io/part-of: litmus
+      app.kubernetes.io/component: experiment-job
+      app.kubernetes.io/version: latest
diff --git a/charts/generic/pod-memory-hog-exec/pod-memory-hog-exec.chartserviceversion.yaml b/charts/generic/pod-memory-hog-exec/pod-memory-hog-exec.chartserviceversion.yaml
new file mode 100644
index 0000000..d24a730
--- /dev/null
+++ b/charts/generic/pod-memory-hog-exec/pod-memory-hog-exec.chartserviceversion.yaml
@@ -0,0 +1,47 @@
+apiVersion: litmuchaos.io/v1alpha1
+kind: ChartServiceVersion
+metadata:
+  createdAt: 2020-04-10T10:28:08Z
+  name: pod-memory-hog-exec
+  version: 0.1.4
+  annotations:
+    categories: Kubernetes
+    vendor: CNCF
+    support: https://slack.kubernetes.io/
+spec:
+  displayName: pod-memory-hog-exec
+  categoryDescription: |
+    pod-memory-hog-exec contains chaos to consume Memory resouces of specified containers in Kubernetes pods.  
+    - Consumes the memory specified by executing a dd command against special files /dev/zero(input) and /dev/null(output)
+    - The application pod should be healthy once chaos is stopped. Expectation is that service-requests should be served despite chaos.
+  keywords:
+    - Kubernetes
+    - Memory
+  platforms:
+    - GKE
+    - Packet(Kubeadm)
+    - Minikube
+    - EKS
+    - AKS
+    - OpenShift(OKD)
+  maturity: alpha
+  maintainers:
+    - name: Udit Gaurav
+      email: udit@chaosnative.com
+  minKubeVersion: 1.12.0
+  provider:
+    name: ChaosNative
+  labels:
+    app.kubernetes.io/component: chartserviceversion
+    app.kubernetes.io/version: latest
+  links:
+    - name: Source Code
+      url: https://github.com/litmuschaos/litmus-go/tree/master/experiments/generic/pod-memory-hog-exec
+    - name: Documentation
+      url: https://docs.litmuschaos.io/docs/pod-memory-hog-exec/
+    - name: Video
+      url: https://www.youtube.com/watch?v=HuAXg8W5Tzo 
+  icon:
+    - base64data: ""
+      mediatype: ""
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod-memory-hog-exec/experiment.yaml 
diff --git a/charts/generic/pod-memory-hog-exec/rbac-psp.yaml b/charts/generic/pod-memory-hog-exec/rbac-psp.yaml
new file mode 100644
index 0000000..7dffa9d
--- /dev/null
+++ b/charts/generic/pod-memory-hog-exec/rbac-psp.yaml
@@ -0,0 +1,61 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: pod-memory-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-memory-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pod-memory-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-memory-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+rules:
+- apiGroups: [""]
+  resources: ["pods","events"]
+  verbs: ["create","list","get","patch","update","delete","deletecollection"]
+- apiGroups: [""]
+  resources: ["pods/exec","pods/log","replicationcontrollers"]
+  verbs: ["create","list","get"]
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["create","list","get","delete","deletecollection"]
+- apiGroups: ["apps"]
+  resources: ["deployments","statefulsets","daemonsets","replicasets"]
+  verbs: ["list","get"]
+- apiGroups: ["apps.openshift.io"]
+  resources: ["deploymentconfigs"]
+  verbs: ["list","get"]
+- apiGroups: ["argoproj.io"]
+  resources: ["rollouts"]
+  verbs: ["list","get"]
+- apiGroups: ["litmuschaos.io"]
+  resources: ["chaosengines","chaosexperiments","chaosresults"]
+  verbs: ["create","list","get","patch","update"]
+- apiGroups: ["policy"]
+  resources: ["podsecuritypolicies"]
+  verbs: ["use"]
+  resourceNames: ["litmus"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pod-memory-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-memory-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: pod-memory-hog-exec-sa
+subjects:
+- kind: ServiceAccount
+  name: pod-memory-hog-exec-sa
+  namespace: default
diff --git a/charts/generic/pod-memory-hog-exec/rbac.yaml b/charts/generic/pod-memory-hog-exec/rbac.yaml
new file mode 100644
index 0000000..4fa73de
--- /dev/null
+++ b/charts/generic/pod-memory-hog-exec/rbac.yaml
@@ -0,0 +1,57 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: pod-memory-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-memory-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pod-memory-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-memory-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+rules:
+- apiGroups: [""]
+  resources: ["pods","events"]
+  verbs: ["create","list","get","patch","update","delete","deletecollection"]
+- apiGroups: [""]
+  resources: ["pods/exec","pods/log","replicationcontrollers"]
+  verbs: ["create","list","get"]
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["create","list","get","delete","deletecollection"]
+- apiGroups: ["apps"]
+  resources: ["deployments","statefulsets","daemonsets","replicasets"]
+  verbs: ["list","get"]
+- apiGroups: ["apps.openshift.io"]
+  resources: ["deploymentconfigs"]
+  verbs: ["list","get"]
+- apiGroups: ["argoproj.io"]
+  resources: ["rollouts"]
+  verbs: ["list","get"]
+- apiGroups: ["litmuschaos.io"]
+  resources: ["chaosengines","chaosexperiments","chaosresults"]
+  verbs: ["create","list","get","patch","update"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pod-memory-hog-exec-sa
+  namespace: default
+  labels:
+    name: pod-memory-hog-exec-sa
+    app.kubernetes.io/part-of: litmus
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: pod-memory-hog-exec-sa
+subjects:
+- kind: ServiceAccount
+  name: pod-memory-hog-exec-sa
+  namespace: default
diff --git a/charts/generic/pod-memory-hog/ansible/experiment.yaml b/charts/generic/pod-memory-hog/ansible/experiment.yaml
deleted file mode 100644
index 7a61889..0000000
--- a/charts/generic/pod-memory-hog/ansible/experiment.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-apiVersion: litmuschaos.io/v1alpha1
-description:
-  message: |
-    Injects memory consumption on pods belonging to an app deployment
-kind: ChaosExperiment
-metadata:
-  name: pod-memory-hog
-  labels:
-    name: pod-memory-hog
-    app.kubernetes.io/part-of: litmus
-    app.kubernetes.io/component: chaosexperiment
-    app.kubernetes.io/version: latest
-spec:
-  definition:
-    scope: Namespaced
-    permissions:
-      - apiGroups:
-          - ""
-          - "batch"
-          - "litmuschaos.io"
-        resources:
-          - "jobs"
-          - "pods"
-          - "pods/log"
-          - "events"
-          - "chaosengines"
-          - "chaosexperiments"
-          - "chaosresults"
-        verbs:
-          - "create"
-          - "list"
-          - "get"
-          - "patch"
-          - "update"
-          - "delete"
-    image: "litmuschaos/ansible-runner:latest"
-    imagePullPolicy: Always 
-    args:
-    - -c
-    - ansible-playbook ./experiments/generic/pod_memory_hog/pod_memory_hog_ansible_logic.yml -i /etc/ansible/hosts -vv; exit 0
-    command:
-    - /bin/bash
-    env:
-    - name: ANSIBLE_STDOUT_CALLBACK
-      value: 'default'
-
-    # Provide name of target container
-    # where chaos has to be injected
-    - name: TARGET_CONTAINER
-      value: ''
-
-    # Enter the amount of memory in megabytes to be consumed by the application pod
-    # default: 500 (Megabytes) 
-    - name: MEMORY_CONSUMPTION
-      value: '500'
-
-    - name: TOTAL_CHAOS_DURATION
-      value: '60' # in seconds
-
-    # Period to wait before and after injection of chaos in sec
-    - name: RAMP_TIME
-      value: ''
-
-    - name: LIB
-      value: 'litmus'
-
-    - name: LIB_IMAGE
-      value: 'litmuschaos/app-memory-stress:latest' 
-    labels:
-      name: pod-memory-hog
-      app.kubernetes.io/part-of: litmus
-      app.kubernetes.io/component: experiment-job
-      app.kubernetes.io/version: latest
diff --git a/charts/generic/pod-memory-hog/ansible/rbac.yaml b/charts/generic/pod-memory-hog/ansible/rbac.yaml
deleted file mode 100644
index b3e5167..0000000
--- a/charts/generic/pod-memory-hog/ansible/rbac.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: pod-memory-hog-sa
-  namespace: default
-  labels:
-    name: pod-memory-hog-sa
-    app.kubernetes.io/part-of: litmus
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: pod-memory-hog-sa
-  namespace: default
-  labels:
-    name: pod-memory-hog-sa
-    app.kubernetes.io/part-of: litmus
-rules:
-- apiGroups: ["","litmuschaos.io","batch"]
-  resources: ["pods","jobs","events","pods/log","chaosengines","chaosexperiments","chaosresults"]
-  verbs: ["create","list","get","patch","update","delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: pod-memory-hog-sa
-  namespace: default
-  labels:
-    name: pod-memory-hog-sa
-    app.kubernetes.io/part-of: litmus
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: pod-memory-hog-sa
-subjects:
-- kind: ServiceAccount
-  name: pod-memory-hog-sa
-  namespace: default
diff --git a/charts/generic/pod-memory-hog/engine.yaml b/charts/generic/pod-memory-hog/engine.yaml
index b146e19..2a96906 100644
--- a/charts/generic/pod-memory-hog/engine.yaml
+++ b/charts/generic/pod-memory-hog/engine.yaml
@@ -20,6 +20,8 @@ spec:
             - name: MEMORY_CONSUMPTION
               value: '500'
 
+            - name: NUMBER_OF_WORKERS
+              value: '1'              
+
             - name: TOTAL_CHAOS_DURATION
               value: '60' # in seconds
-            
\ No newline at end of file
diff --git a/charts/generic/pod-memory-hog/experiment.yaml b/charts/generic/pod-memory-hog/experiment.yaml
index 2217710..4e04c3d 100644
--- a/charts/generic/pod-memory-hog/experiment.yaml
+++ b/charts/generic/pod-memory-hog/experiment.yaml
@@ -46,7 +46,7 @@ spec:
           - "update"
           - "delete"
           - "deletecollection"
-    image: "litmuschaos/go-runner:latest"
+    image: "litmuschaos/go-runner:ci"
     imagePullPolicy: Always
     args:
     - -c
@@ -60,6 +60,10 @@ spec:
       ## enter the amount of memory in megabytes to be consumed by the application pod
       - name: MEMORY_CONSUMPTION
         value: '500'
+      
+      ## Number of workers to perform stress
+      - name: NUMBER_OF_WORKERS
+        value: '1'   
 
       ## percentage of total pods to target
       - name: PODS_AFFECTED_PERC
@@ -76,7 +80,7 @@ spec:
 
       ## It is used in pumba lib only    
       - name: LIB_IMAGE
-        value: 'litmuschaos/go-runner:latest'
+        value: 'litmuschaos/go-runner:ci'
 
       ## It is used in pumba lib only    
       - name: STRESS_IMAGE
diff --git a/charts/generic/pod-memory-hog/pod-memory-hog.chartserviceversion.yaml b/charts/generic/pod-memory-hog/pod-memory-hog.chartserviceversion.yaml
index 46ae6f0..c9fb45a 100644
--- a/charts/generic/pod-memory-hog/pod-memory-hog.chartserviceversion.yaml
+++ b/charts/generic/pod-memory-hog/pod-memory-hog.chartserviceversion.yaml
@@ -1,9 +1,9 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  createdAt: 2020-04-10T10:28:08Z
+  createdAt: 2021-06-16T10:28:08Z
   name: pod-memory-hog
-  version: 0.1.4
+  version: 0.1.0
   annotations:
     categories: Kubernetes
     vendor: CNCF
@@ -11,8 +11,9 @@ metadata:
 spec:
   displayName: pod-memory-hog
   categoryDescription: |
-    Pod-Memory-Hog contains chaos to consume Memory resouces of specified containers in Kubernetes pods.  
-    - Consumes the memory specified by executing a dd command against special files /dev/zero(input) and /dev/null(output)
+    Pod-Memory-Hog contains chaos to consume memory resouces of specified containers in Kubernetes pods.    
+    - Causes memory resource consumption on specified application containers using cgroups and litmus nsutil that consume memory resources of the given target containers.
+    - It Can test the application's resilience to potential slowness/unavailability of some replicas due to high memory load
     - The application pod should be healthy once chaos is stopped. Expectation is that service-requests should be served despite chaos.
   keywords:
     - Kubernetes
@@ -27,10 +28,10 @@ spec:
   maturity: alpha
   maintainers:
     - name: Udit Gaurav
-      email: udit.gaurav@mayadata.io
+      email: udit@chaosnative.com
   minKubeVersion: 1.12.0
   provider:
-    name: Mayadata
+    name: ChaosNative
   labels:
     app.kubernetes.io/component: chartserviceversion
     app.kubernetes.io/version: latest
diff --git a/scripts/combine-all-crs.go b/scripts/combine-all-crs.go
index 8781a6c..9df0b2b 100644
--- a/scripts/combine-all-crs.go
+++ b/scripts/combine-all-crs.go
@@ -50,7 +50,7 @@ func main() {
 
 				CRName, err := GetCRName(subdirectory + "/experiment.yaml")
 				if err != nil || CRName == "" {
-					log.Fatalf("unable to extract the CR name, err: %v", err)
+					log.Fatalf("unable to extract the CR name for %v file, err: %v", subdirectory+"/experiment.yaml", err)
 				}
 
 				if !Contains(CRName, CRNames) {