Ceph: Update armada manifests to remove jobs on upgrade correctly

This PS updates the ceph chart to remove keyring management jobs
for namespaces.

Change-Id: Id0be7dcc6fd1c6b28a3a0514dc0442a41d5c5b9d

tools/deployment/armada/multinode/armada-lma.yaml

@@ -75,6 +75,16 @@ data:
     no_hooks: false
   upgrade:
     no_hooks: false
+    pre:
+      delete:
+        - type: job
+          labels:
+            application: ceph
+            component: client-key-generator
+        - type: job
+          labels:
+            application: ceph
+            component: client-key-cleaner
   values:
     endpoints:
       identity:

tools/deployment/armada/multinode/armada-osh.yaml

@@ -84,7 +84,11 @@ data:
         - type: job
           labels:
             application: ceph
-            component: namespace-client-key-generator
+            component: client-key-generator
+        - type: job
+          labels:
+            application: ceph
+            component: client-key-cleaner
   values:
     labels:
       jobs: