sample inventory + check code

playbooks/inventory.yml

@@ -17,8 +17,42 @@ all:
     op_cat: redhat-operators
     op_pkg: amq-streams
     op_chn: stable
+    op_nsp: openshift-operators
     desired_csv: amqstreams.v2.7.0-4
 
+    # Some cleanup here.
+    removed_operators:
+      - sub_nspc: openshift-operators
+        sub_name: openshift-pipelines-operator
+        csv_name: foobar
+        pre_cleanup:
+          - openshiftpipelinesascodes.operator.tekton.dev
+          - tektonaddons.operator.tekton.dev
+          - tektonchains.operator.tekton.dev
+          - tektonconfigs.operator.tekton.dev
+          - tektonhubs.operator.tekton.dev
+          - tektoninstallersets.operator.tekton.dev
+          - tektonpipelines.operator.tekton.dev
+          - tektonresults.operator.tekton.dev
+          - tektontriggers.operator.tekton.dev
+          - repositories.pipelinesascode.tekton.dev
+          - resolutionrequests.resolution.tekton.dev
+          - clustertasks.tekton.dev
+          - customruns.tekton.dev
+          - pipelineruns.tekton.dev
+          - pipelines.tekton.dev
+          - stepactions.tekton.dev
+          - taskruns.tekton.dev
+          - tasks.tekton.dev
+          - verificationpolicies.tekton.dev
+          - clusterinterceptors.triggers.tekton.dev
+          - clustertriggerbindings.triggers.tekton.dev
+          - eventlisteners.triggers.tekton.dev
+          - interceptors.triggers.tekton.dev
+          - triggerbindings.triggers.tekton.dev
+          - triggers.triggers.tekton.dev
+          - triggertemplates.triggers.tekton.dev
+
     # The list of OpenShift clusters check-env will try to connect to.
     clusters:
       - ocp4

playbooks/roles/remove-operators/tasks/main.yml

@@ -7,10 +7,8 @@
 #     - sub_nspc          subscription namespace
 #       sub_name          subscription name
 #       csv_name          CSV name to check for
-#       pre_cleanup       pre-cleanup tasks, a list of resource types to remove (ALL)
-#         - kind
-#           apiv
-#       add_cleanup       additional CRDs to remove post-uninstall, a list of regex name matches
+#       pre_cleanup       pre-cleanup tasks, a list fqrt to remove (ALL)
+#       add_cleanup       additional CRDs to remove post-uninstall, a list of fqrn
 #
 # This role must then be applied as:
 #
@@ -21,13 +19,13 @@
 #     loop: "{{ removed_operators }}"
 #
 - name: Remove any of the resources found
-  k8s:
+  k8s_info:
     kubeconfig: tmp/kubeconfig-ocp4
     validate_certs: no
-    api_version: "{{ item.apiv }}"
+    #api_version: "{{ item.apiv }}"
     kind: "{{ item.kind }}"
-    delete_all: true
-    state: absent
+    #delete_all: true
+    #state: absent
   loop: "{{ role.pre_cleanup }}"
   register: removed