Check for migrated status

roles/etcd/tasks/remove-etcd-v2-data.yml

@@ -1,12 +1,24 @@
+---
 - name: Verify cluster is healthy pre-upgrade
   command: "{{ etcdctlv2 }} cluster-health"
 
-- name: Remove etcdv2 kubernetes data
-  command: "{{ etcdctlv2 }} rm -r /kubernetes.io"
-  register: etcdv2_remove_k8s
-  failed_when: "'Key not found' not in etcdv2_remove_k8s.stderr"
+- name: Check migrated status
+  command: "{{ etcdctlv2 }} get /kubernetes.io"
+  register: etcdv2_migrated_status
+  failed_when: ('stdout' not in etcdv2_migrated_status)
 
-- name: Remove etcdv2 openshift data
-  command: "{{ etcdctlv2 }} rm -r /openshift.io"
-  register: etcdv2_remove_openshift
-  failed_when: "'Key not found' not in etcdv2_remove_openshift.stderr"
+- block:
+  - name: Remove etcdv2 kubernetes data
+    command: "{{ etcdctlv2 }} rm -r /kubernetes.io"
+    register: etcdv2_remove_k8s
+    failed_when: ('Key not found' not in etcdv2_remove_k8s.stderr)
+
+  - name: Remove etcdv2 openshift data
+    command: "{{ etcdctlv2 }} rm -r /openshift.io"
+    register: etcdv2_remove_openshift
+    failed_when: ('Key not found' not in etcdv2_remove_openshift.stderr)
+
+  - name: Set migrated mark
+    command: "{{ etcdctlv2 }} set /kubernetes.io migrated"
+
+  when: (etcdv2_migrated_status.stdout != 'migrated')