From c5b2e65a103379874a00d745760be19c3a5992db Mon Sep 17 00:00:00 2001 From: kmova Date: Sat, 25 Aug 2018 13:26:07 +0000 Subject: [PATCH] Update e2e playbooks with new label convention openebs -> openebs.io Signed-off-by: kmova --- e2e/ansible/playbooks/feature/ha/ha.yml | 4 ++-- .../playbooks/hyperconverged/test-k8s-memleak/test-mem.py | 2 +- .../test-resize-jiva-volume/resize-volume-vars.yml | 2 +- .../test-resize-jiva-volume/resize-volume.yml | 2 +- .../playbooks/resiliency/test-ctrl-failure/chaoskube.yaml | 2 +- .../resiliency/test-ctrl-failure/test-ctrl-failure.yml | 6 +++--- .../resiliency/test-disk-failure/test-disk-failure.yml | 4 ++-- .../test-network-failure-rep/test-nw-failure-rep.yml | 6 +++--- .../inject_replica_quorum_failure.yml | 2 +- .../test-replica-quorum-failure.yml | 4 ++-- .../resiliency/test-single-replica-failure/chaoskube.yaml | 2 +- .../test-single-replica-failure.yml | 8 ++++---- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/e2e/ansible/playbooks/feature/ha/ha.yml b/e2e/ansible/playbooks/feature/ha/ha.yml index ebeb5db5bc..2ff40bc8e8 100644 --- a/e2e/ansible/playbooks/feature/ha/ha.yml +++ b/e2e/ansible/playbooks/feature/ha/ha.yml @@ -90,7 +90,7 @@ - name: Get storage ctrl pod name shell: > source ~/.profile; - kubectl get pods -n {{ namespace }} -l openebs/controller=jiva-controller --no-headers + kubectl get pods -n {{ namespace }} -l openebs.io/controller=jiva-controller --no-headers args: executable: /bin/bash register: result @@ -192,7 +192,7 @@ - name: Check if ctrl pod is restarted within 30s shell: > source ~/.profile; - kubectl get pods -n {{ namespace }} -l openebs/controller=jiva-controller + kubectl get pods -n {{ namespace }} -l openebs.io/controller=jiva-controller args: executable: /bin/bash register: result diff --git a/e2e/ansible/playbooks/hyperconverged/test-k8s-memleak/test-mem.py b/e2e/ansible/playbooks/hyperconverged/test-k8s-memleak/test-mem.py index 1539316693..5ce2be2e37 100644 --- a/e2e/ansible/playbooks/hyperconverged/test-k8s-memleak/test-mem.py +++ b/e2e/ansible/playbooks/hyperconverged/test-k8s-memleak/test-mem.py @@ -8,7 +8,7 @@ import time, os, sys list = [] namespace = sys.argv[1] -cmd_cntrl_name = "source ~/.profile; kubectl get pod -n %s -l openebs/controller=jiva-controller --no-headers | awk '{print $1}'" %(namespace) +cmd_cntrl_name = "source ~/.profile; kubectl get pod -n %s -l openebs.io/controller=jiva-controller --no-headers | awk '{print $1}'" %(namespace) print cmd_cntrl_name out = subprocess.Popen(cmd_cntrl_name,stdout=subprocess.PIPE,shell=True) cntrl_name = out.communicate() diff --git a/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume-vars.yml b/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume-vars.yml index 81bbb7913c..63f9e8a261 100644 --- a/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume-vars.yml +++ b/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume-vars.yml @@ -11,6 +11,6 @@ claim_name: percona-claim app_label: "name=percona" -replica_label: "openebs/replica=jiva-replica" +replica_label: "openebs.io/replica=jiva-replica" namespace: resize-volume diff --git a/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume.yml b/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume.yml index 63f8432394..c420fc2372 100644 --- a/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume.yml +++ b/e2e/ansible/playbooks/hyperconverged/test-resize-jiva-volume/resize-volume.yml @@ -169,7 +169,7 @@ delegate_to: "{{ groups['kubernetes-kubemasters'].0}}" - name: Getting the replica pod names - shell: kubectl get pods --all-namespaces --show-labels | grep openebs/replica=jiva-replica | awk {'print $2'} | awk 'FNR == {{ item }} {print}' + shell: kubectl get pods --all-namespaces --show-labels | grep openebs.io/replica=jiva-replica | awk {'print $2'} | awk 'FNR == {{ item }} {print}' args: executable: /bin/bash register: pods diff --git a/e2e/ansible/playbooks/resiliency/test-ctrl-failure/chaoskube.yaml b/e2e/ansible/playbooks/resiliency/test-ctrl-failure/chaoskube.yaml index 2a388f2054..03154efb9b 100644 --- a/e2e/ansible/playbooks/resiliency/test-ctrl-failure/chaoskube.yaml +++ b/e2e/ansible/playbooks/resiliency/test-ctrl-failure/chaoskube.yaml @@ -24,7 +24,7 @@ spec: #- --interval=10m # only target pods in the test environment - #- --labels=openebs/controller=jiva-controller + #- --labels=openebs.io/controller=jiva-controller # only consider pods with this annotation #- --annotations=chaos.alpha.kubernetes.io/enabled=true diff --git a/e2e/ansible/playbooks/resiliency/test-ctrl-failure/test-ctrl-failure.yml b/e2e/ansible/playbooks/resiliency/test-ctrl-failure/test-ctrl-failure.yml index 3f6fc8fed2..57075700ef 100644 --- a/e2e/ansible/playbooks/resiliency/test-ctrl-failure/test-ctrl-failure.yml +++ b/e2e/ansible/playbooks/resiliency/test-ctrl-failure/test-ctrl-failure.yml @@ -117,7 +117,7 @@ - name: Get the name of the volume ctrl deployment shell: > source ~/.profile; kubectl get deployments -n {{ namespace }} - -l openebs/controller=jiva-controller --no-headers + -l openebs.io/controller=jiva-controller --no-headers args: executable: /bin/bash delegate_to: "{{groups['kubernetes-kubemasters'].0}}" @@ -147,7 +147,7 @@ shell: > source ~/.profile; kubectl exec {{ chaospod }} -n {{ namespace }} -- timeout -t {{ chaos_duration }} chaoskube - --labels 'openebs/controller=jiva-controller' + --labels 'openebs.io/controller=jiva-controller' --no-dry-run --interval={{ chaos_interval }}s --debug --namespaces={{ namespace }} @@ -231,4 +231,4 @@ - name: Set Test Name as Fact set_fact: - testname: "{{ test_name }}" \ No newline at end of file + testname: "{{ test_name }}" diff --git a/e2e/ansible/playbooks/resiliency/test-disk-failure/test-disk-failure.yml b/e2e/ansible/playbooks/resiliency/test-disk-failure/test-disk-failure.yml index 63939aaa8f..1a20a75602 100644 --- a/e2e/ansible/playbooks/resiliency/test-disk-failure/test-disk-failure.yml +++ b/e2e/ansible/playbooks/resiliency/test-disk-failure/test-disk-failure.yml @@ -144,7 +144,7 @@ include_tasks: "{{utils_path}}/deploy_check.yml" vars: ns: "{{ namespace }}" - lkey: openebs/replica + lkey: openebs.io/replica lvalue: jiva-replica - name: 8) Obtaining the replica pods running on specified node @@ -269,7 +269,7 @@ include_tasks: "{{utils_path}}/deploy_check.yml" vars: ns: "{{ namespace }}" - lkey: openebs/replica + lkey: openebs.io/replica lvalue: jiva-replica - name: 14) Get Controller SVC IP diff --git a/e2e/ansible/playbooks/resiliency/test-network-failure-rep/test-nw-failure-rep.yml b/e2e/ansible/playbooks/resiliency/test-network-failure-rep/test-nw-failure-rep.yml index a58735c3f7..78456edf3a 100644 --- a/e2e/ansible/playbooks/resiliency/test-network-failure-rep/test-nw-failure-rep.yml +++ b/e2e/ansible/playbooks/resiliency/test-network-failure-rep/test-nw-failure-rep.yml @@ -105,14 +105,14 @@ lvalue: percona - name: Get the node details on which pvc-rep is scheduled - shell: source ~/.profile; kubectl get pods -n {{ namespace }} -o wide -l openebs/replica=jiva-replica --no-headers | awk 'FNR == 1 {print}' | awk {'print $7'} + shell: source ~/.profile; kubectl get pods -n {{ namespace }} -o wide -l openebs.io/replica=jiva-replica --no-headers | awk 'FNR == 1 {print}' | awk {'print $7'} args: executable: /bin/bash delegate_to: "{{groups['kubernetes-kubemasters'].0}}" register: node_rep - name: Get the pvc-rep name - shell: source ~/.profile; kubectl get pods -n {{ namespace }} -l openebs/replica=jiva-replica --no-headers | awk 'FNR == 1 {print}'| awk {'print $1'} + shell: source ~/.profile; kubectl get pods -n {{ namespace }} -l openebs.io/replica=jiva-replica --no-headers | awk 'FNR == 1 {print}'| awk {'print $1'} args: executable: /bin/bash delegate_to: "{{groups['kubernetes-kubemasters'].0}}" @@ -209,4 +209,4 @@ - name: Set Test Name as Fact set_fact: - testname: "{{ test_name }}" \ No newline at end of file + testname: "{{ test_name }}" diff --git a/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/inject_replica_quorum_failure.yml b/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/inject_replica_quorum_failure.yml index 397e66f3c8..25e510746f 100644 --- a/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/inject_replica_quorum_failure.yml +++ b/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/inject_replica_quorum_failure.yml @@ -11,7 +11,7 @@ changed_when: true - name: Get replica pod name - shell: source ~/.profile; kubectl get pods -n {{ namespace }} -l openebs/replica=jiva-replica --no-headers | awk 'FNR == 1 {print}' | awk {'print $1'} + shell: source ~/.profile; kubectl get pods -n {{ namespace }} -l openebs.io/replica=jiva-replica --no-headers | awk 'FNR == 1 {print}' | awk {'print $1'} args: executable: /bin/bash register: result diff --git a/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/test-replica-quorum-failure.yml b/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/test-replica-quorum-failure.yml index 086c8584ba..59bc9b498b 100644 --- a/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/test-replica-quorum-failure.yml +++ b/e2e/ansible/playbooks/resiliency/test-replica-quorum-failure/test-replica-quorum-failure.yml @@ -96,7 +96,7 @@ - name: Get the name of the volume replica deployment shell: > source ~/.profile; kubectl get deployments -n {{ namespace }} - -l openebs/replica=jiva-replica --no-headers + -l openebs.io/replica=jiva-replica --no-headers args: executable: /bin/bash delegate_to: "{{groups['kubernetes-kubemasters'].0}}" @@ -181,4 +181,4 @@ - name: Set Test Name as Fact set_fact: - testname: "{{ test_name }}" \ No newline at end of file + testname: "{{ test_name }}" diff --git a/e2e/ansible/playbooks/resiliency/test-single-replica-failure/chaoskube.yaml b/e2e/ansible/playbooks/resiliency/test-single-replica-failure/chaoskube.yaml index 2a388f2054..03154efb9b 100644 --- a/e2e/ansible/playbooks/resiliency/test-single-replica-failure/chaoskube.yaml +++ b/e2e/ansible/playbooks/resiliency/test-single-replica-failure/chaoskube.yaml @@ -24,7 +24,7 @@ spec: #- --interval=10m # only target pods in the test environment - #- --labels=openebs/controller=jiva-controller + #- --labels=openebs.io/controller=jiva-controller # only consider pods with this annotation #- --annotations=chaos.alpha.kubernetes.io/enabled=true diff --git a/e2e/ansible/playbooks/resiliency/test-single-replica-failure/test-single-replica-failure.yml b/e2e/ansible/playbooks/resiliency/test-single-replica-failure/test-single-replica-failure.yml index 3ce31b7397..d692d15780 100644 --- a/e2e/ansible/playbooks/resiliency/test-single-replica-failure/test-single-replica-failure.yml +++ b/e2e/ansible/playbooks/resiliency/test-single-replica-failure/test-single-replica-failure.yml @@ -125,7 +125,7 @@ - name: Get the name of the volume single replica deployment shell: > source ~/.profile; kubectl get deployments -n {{ namespace }} - -l openebs/replica=jiva-replica --no-headers + -l openebs.io/replica=jiva-replica --no-headers args: executable: /bin/bash delegate_to: "{{groups['kubernetes-kubemasters'].0}}" @@ -138,7 +138,7 @@ - name: Get the name of the single replica pod to a variable shell: > source ~/.profile; kubectl get pods -n {{ namespace }} - -l openebs/replica=jiva-replica --no-headers + -l openebs.io/replica=jiva-replica --no-headers args: executable: /bin/bash delegate_to: "{{groups['kubernetes-kubemasters'].0}}" @@ -193,7 +193,7 @@ shell: > source ~/.profile; kubectl exec {{ chaospod }} -n {{ namespace }} -- timeout -t {{ chaos_duration }} chaoskube - --labels 'openebs/replica=jiva-replica' + --labels 'openebs.io/replica=jiva-replica' --no-dry-run --interval={{ chaos_interval }}s --debug --namespaces={{ namespace }} @@ -294,4 +294,4 @@ - name: Set Test Name as Fact set_fact: - testname: "{{ test_name }}" \ No newline at end of file + testname: "{{ test_name }}"