From ead57fccff481048ad458716f02be99fb59d0abe Mon Sep 17 00:00:00 2001
From: Robert Choi <taeilchoi1@gmail.com>
Date: Mon, 30 Apr 2018 20:53:27 +0900
Subject: [PATCH] Make ceph clean job stable

This PS makes ceph's client-key clean job stable by precreating the role
and rolebinding resources for the job, thereby removing the potential
for the race conditions. This is related to
https://review.openstack.org/#/c/558981/

Change-Id: Ie56cf09b5adf5c7e0cf214480aaab2e623489994
---
 ceph-client/templates/job-namespace-client-key-cleaner.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ceph-client/templates/job-namespace-client-key-cleaner.yaml b/ceph-client/templates/job-namespace-client-key-cleaner.yaml
index 7e6b37cccf..d87d1cba3d 100644
--- a/ceph-client/templates/job-namespace-client-key-cleaner.yaml
+++ b/ceph-client/templates/job-namespace-client-key-cleaner.yaml
@@ -27,8 +27,6 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   name: {{ $serviceAccountName }}
-  annotations:
-    "helm.sh/hook": pre-delete
 rules:
   - apiGroups:
       - ""
@@ -43,8 +41,6 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   name: {{ $serviceAccountName }}
-  annotations:
-    "helm.sh/hook": pre-delete
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role