From de04df5ff64b7bb4ef98e9dea642bd9bb65b8cb9 Mon Sep 17 00:00:00 2001
From: austin <asmacdo@gmail.com>
Date: Thu, 6 Aug 2020 10:44:30 -0400
Subject: [PATCH] Various molecule scaffolding tweaks

---
 .../internal/templates/config/testing/kustomization.go      | 1 -
 .../internal/templates/molecule/mdefault/verify.go          | 6 +++++-
 .../scaffolds/internal/templates/molecule/mkind/destroy.go  | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go
index 0e387e69ff..a244e48fb0 100644
--- a/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go
+++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go
@@ -52,7 +52,6 @@ namePrefix: osdk-
 
 patchesStrategicMerge:
 - manager_image.yaml
-- pull_policy/Never.yaml
 - debug_logs_patch.yaml
 - ../default/manager_auth_proxy_patch.yaml
 
diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go
index 0e9eb3a41c..985dd8727d 100644
--- a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go
+++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go
@@ -44,6 +44,9 @@ const verifyTemplate = `---
   collections:
     - community.kubernetes
 
+  vars:
+    ctrl_label: control-plane=controller-manager
+
   tasks:
     - block:
         - name: Import all test files from tasks/
@@ -71,7 +74,8 @@ const verifyTemplate = `---
           k8s_log:
             name: '{{ "{{ item.metadata.name }}" }}'
             namespace: '{{ "{{ namespace }}" }}'
-          loop: "{{ "{{ q('k8s', api_version='v1', kind='Pod', namespace=namespace) }}" }}"
+            container: manager
+          loop: "{{ "{{ q('k8s', api_version='v1', kind='Pod', namespace=namespace, label_selector=ctrl_label) }}" }}"
           register: debug_logs
 
         - name: Output gathered resources
diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go
index 2474be5d15..40839480ec 100644
--- a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go
+++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go
@@ -47,4 +47,9 @@ const destroyTemplate = `---
   tasks:
     - name: Destroy test kind cluster
       command: kind delete cluster --name osdk-test --kubeconfig {{ "{{ kubeconfig }}" }}
+
+    - name: Unset pull policy
+      command: '{{ "{{ kustomize }}" }} edit remove patch pull_policy/{{ "{{ operator_pull_policy }}" }}.yaml'
+      args:
+        chdir: '{{ "{{ config_dir }}" }}/testing'
 `