operator: removed legacy secret deletion code in rbd
Signed-off-by: Anshuman <anshuman@ibm.com>
This commit is contained in:
1 parent
517f519c23
commit
79b24564ef
1 file changed
-11
@@ -26,7 +26,6 @@ import (
|
||||
"github.com/rook/rook/pkg/operator/ceph/config/keyring"
|
||||
opcontroller "github.com/rook/rook/pkg/operator/ceph/controller"
|
||||
"github.com/rook/rook/pkg/operator/k8sutil"
|
||||
kerrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||
@@ -68,16 +67,6 @@ func (r *ReconcileCephRBDMirror) generateKeyring(clusterInfo *client.ClusterInfo
|
||||
key = newKey
|
||||
}
|
||||
|
||||
// Delete legacy key store for upgrade from Rook v0.9.x to v1.0.x
|
||||
err = r.context.Clientset.CoreV1().Secrets(clusterInfo.Namespace).Delete(r.opManagerContext, daemonConfig.ResourceName, metav1.DeleteOptions{})
|
||||
if err != nil {
|
||||
if kerrors.IsNotFound(err) {
|
||||
logger.Debugf("legacy rbd-mirror key %q is already removed", daemonConfig.ResourceName)
|
||||
} else {
|
||||
logger.Warningf("legacy rbd-mirror key %q could not be removed. %v", daemonConfig.ResourceName, err)
|
||||
}
|
||||
}
|
||||
|
||||
keyring := fmt.Sprintf(keyringTemplate, daemonConfig.DaemonID, key)
|
||||
return s.CreateOrUpdate(daemonConfig.ResourceName, keyring)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user