From e21ad0212dfe04bb0e22a00506e271d0a1993af6 Mon Sep 17 00:00:00 2001
From: abikouo <79859644+abikouo@users.noreply.github.com>
Date: Thu, 26 Aug 2021 18:08:48 +0200
Subject: [PATCH] fix drain test for ansible 2.9 release (#211)

Test molecule on ansible release 2.9 and 2.10

SUMMARY

Debug only

ISSUE TYPE


Feature Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: None <None>
---
 molecule/default/tasks/drain.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/molecule/default/tasks/drain.yml b/molecule/default/tasks/drain.yml
index baf52a80..9da4defd 100644
--- a/molecule/default/tasks/drain.yml
+++ b/molecule/default/tasks/drain.yml
@@ -177,8 +177,9 @@
     k8s_info:
       namespace: '{{ drain_namespace }}'
       kind: Pod
+      name: '{{ drain_pod_name }}'
     register: _result
-    failed_when: _result.resources | selectattr("metadata.ownerReferences", "undefined") | length > 0
+    failed_when: _result.resources
 
   - name: Test drain idempotency
     k8s_drain:
@@ -212,6 +213,13 @@
       name: '{{ node_to_drain }}'
 
   always:
+  - name: Uncordon node
+    k8s_drain:
+      state: uncordon
+      name: '{{ node_to_drain }}'
+    when: node_to_drain is defined
+    ignore_errors: true
+
   - name: delete namespace
     k8s:
       state: absent