revert back to apiv+kind

playbooks/inventory.yml

@@ -26,32 +26,58 @@ all:
         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
+           - kind: openshiftpipelinesascodes
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektonaddons
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektonchains
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektonconfigs
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektonhubs
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektoninstallersets
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektonpipelines
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektonresults
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: tektontriggers
+             apiv: operator.tekton.dev/v1alpha1
+           - kind: repositories
+             apiv: pipelinesascode.tekton.dev/v1alpha1
+           - kind: resolutionrequests
+             apiv: resolution.tekton.dev/v1beta1
+           - kind: clustertasks
+             apiv: tekton.dev/v1beta1
+           - kind: customruns
+             apiv: tekton.dev/v1beta1
+           - kind: pipelineruns
+             apiv: tekton.dev/v1
+           - kind: pipelines
+             apiv: tekton.dev/v1
+           - kind: stepactions
+             apiv: tekton.dev/v1alpha1
+           - kind: taskruns
+             apiv: tekton.dev/v1
+           - kind: tasks
+             apiv: tekton.dev/v1
+           - kind: verificationpolicies
+             apiv: tekton.dev/v1alpha1
+           - kind: clusterinterceptors
+             apiv: triggers.tekton.dev/v1alpha1
+           - kind: clustertriggerbindings
+             apiv: triggers.tekton.dev/v1beta1
+           - kind: eventlisteners
+             apiv: triggers.tekton.dev/v1beta1
+           - kind: interceptors
+             apiv: triggers.tekton.dev/v1alpha1
+           - kind: triggerbindings
+             apiv: triggers.tekton.dev/v1beta1
+           - kind: triggers
+             apiv: triggers.tekton.dev/v1beta1
+           - kind: triggertemplates
+             apiv: triggers.tekton.dev/v1beta1
 
     # The list of OpenShift clusters check-env will try to connect to.
     clusters:

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

@@ -7,7 +7,9 @@
 #     - sub_nspc          subscription namespace
 #       sub_name          subscription name
 #       csv_name          CSV name to check for
-#       pre_cleanup       pre-cleanup tasks, a list fqrt to remove (ALL)
+#       pre_cleanup       pre-cleanup tasks, a list rtypes to remove (ALL)
+#         - apiv
+#           kind
 #       add_cleanup       additional CRDs to remove post-uninstall, a list of fqrn
 #
 # This role must then be applied as:
@@ -22,8 +24,8 @@
   k8s_info:
     kubeconfig: tmp/kubeconfig-ocp4
     validate_certs: no
-    #api_version: "{{ item.apiv }}"
-    kind: "{{ item }}"
+    api_version: "{{ item.apiv }}"
+    kind: "{{ item.kind }}"
     #delete_all: true
     #state: absent
   loop: "{{ role.pre_cleanup }}"