fixed cleanup hook with helm hook-weight annotations

Author: ATGardner

charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml

@@ -3,8 +3,8 @@ kind: Job
 metadata:
   name: cleanup-runtime-resources
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
+    helm.sh/hook: pre-delete
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
 spec:
   backoffLimit: 3
   template:

charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml

@@ -8,8 +8,9 @@ kind: Job
 metadata:
   name: delete-runtime-from-platform
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "5"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
 spec:
   backoffLimit: 3
   template:

charts/gitops-runtime/templates/hooks/pre-uninstall/rbac.yaml

@@ -1,10 +1,20 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: runtime-cleanup
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: runtime-cleanup
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
 rules:
   - apiGroups:
       - "*"
@@ -18,20 +28,13 @@ kind: RoleBinding
 metadata:
   name: runtime-cleanup
   annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
 roleRef:
   apiGroup: ""
   kind: Role
   name: runtime-cleanup
 subjects:
   - kind: ServiceAccount
     name: runtime-cleanup
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: runtime-cleanup
-  annotations:
-    "helm.sh/hook": pre-delete
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed