Fix cleanup in case of anfconfigurator is enabled

Author: Utkarshjh

helm/trident-operator/templates/postdeletecrdshook.yaml

@@ -23,7 +23,7 @@ metadata:
 rules:
 - apiGroups: ["apiextensions.k8s.io"]
   resources: ["customresourcedefinitions"]
-  verbs: ["delete"]
+  verbs: ["get", "list", "delete", "patch"]
 
 ---
 
@@ -72,7 +72,10 @@ spec:
           - -c
           - |
             set -x
+            kubectl patch crd tridentorchestrators.trident.netapp.io -p '{"metadata":{"finalizers":[]}}' --type=merge
             kubectl delete crd tridentorchestrators.trident.netapp.io
+            kubectl patch crd tridentconfigurators.trident.netapp.io -p '{"metadata":{"finalizers":[]}}' --type=merge
+            kubectl delete crd tridentconfigurators.trident.netapp.io
       restartPolicy: Never
   backoffLimit: 4
 

helm/trident-operator/templates/predeletecrdshook.yaml

@@ -27,8 +27,8 @@ spec:
           - |
             set -x
             if kubectl get torc trident -n trident; then
-              kubectl patch torc trident -n trident --type=merge -p '{"spec":{"wipeout":["crds"],"uninstall":true, "skipCRDsToObliviate":["tridentorchestrators.trident.netapp.io"]}}'
-              while kubectl get crds | grep '.trident.netapp.io' | grep -v 'tridentorchestrators.trident.netapp.io'; do
+              kubectl patch torc trident -n trident --type=merge -p '{"spec":{"wipeout":["crds"],"uninstall":true, "skipCRDsToObliviate":["tridentorchestrators.trident.netapp.io", "tridentconfigurators.trident.netapp.io"]}}'
+              while kubectl get crds | grep '.trident.netapp.io' | grep -v -e 'tridentorchestrators.trident.netapp.io' -e 'tridentconfigurators.trident.netapp.io'; do
                 echo 'Waiting for CRDs to be deleted...'
                 sleep 5
               done

helm/trident-operator/templates/tridentorchestrator.yaml

@@ -82,4 +82,7 @@ spec:
   nodePrep: {{- range .Values.nodePrep }}
     - {{.}} {{- end }}
   {{- end }}
-  
+  {{- if .Values.skipCRDsToObliviate }}
+  skipCRDsToObliviate: {{- range .Values.skipCRDsToObliviate }}
+    - {{.}} {{- end }}
+  {{- end }}