go for removal, include CRDs

playbooks/inventory.yml

@@ -26,58 +26,85 @@ all:
         sub_name: openshift-pipelines-operator
         csv_name: foobar
         pre_cleanup:
-           - 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
+          - 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
+        add_cleanup:
+          - clusterinterceptors.triggers.tekton.dev
+          - clustertasks.tekton.dev
+          - clustertriggerbindings.triggers.tekton.dev
+          - customruns.tekton.dev
+          - eventlisteners.triggers.tekton.dev
+          - interceptors.triggers.tekton.dev
+          - openshiftpipelinesascodes.operator.tekton.dev
+          - pipelineruns.tekton.dev
+          - pipelines.tekton.dev
+          - repositories.pipelinesascode.tekton.dev
+          - resolutionrequests.resolution.tekton.dev
+          - stepactions.tekton.dev
+          - taskruns.tekton.dev
+          - tasks.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
+          - triggerbindings.triggers.tekton.dev
+          - triggers.triggers.tekton.dev
+          - triggertemplates.triggers.tekton.dev
+          - verificationpolicies.tekton.dev
 
     # The list of OpenShift clusters check-env will try to connect to.
     clusters:

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

@@ -10,7 +10,7 @@
 #       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
+#       add_cleanup       additional CRDs to remove post-uninstall, a list
 #
 # This role must then be applied as:
 #
@@ -21,18 +21,34 @@
 #     loop: "{{ removed_operators }}"
 #
 - name: Remove any of the resources found
-  k8s_info:
+  k8s:
     kubeconfig: tmp/kubeconfig-ocp4
     validate_certs: no
     api_version: "{{ item.apiv }}"
     kind: "{{ item.kind }}"
-    #delete_all: true
-    #state: absent
+    delete_all: true
+    state: absent
   loop: "{{ role.pre_cleanup }}"
   register: removed
 
-- name: debug
-  debug:
-    var: removed
+- name: Remove the subscription
+  k8s:
+    kubeconfig: tmp/kubeconfig-ocp4
+    validate_certs: no
+    api_version: operators.coreos.com/v1
+    kind: subscription
+    name: "{{ sub_name }}"
+    namespace: "{{ sub_nspc }}"
+    state: absent
+
+- name: Do post-cleanup
+  k8s:
+    kubeconfig: tmp/kubeconfig-ocp4
+    validate_certs: no
+    api_version: apiextensions.k8s.io/v1
+    kind: customresourcedefinition
+    name: "{{ item }}"
+    state: absent
+  loop: "{{ role.add_cleanup }}"
 
 ...