feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

ceph: no need for removal of legacy rgw deployments

Browse Source 
The legacy rgw deployments were removed in 1.0, so there is no more need
for the operator to keep checking for those!

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
Travis Nielsen
2020-12-18 12:03:50 -07:00
parent 0d4e6843ba
commit e8ea6dc2f8
1 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/object/rgw.go
-48
View File
@@ -59,10 +59,6 @@ type rgwConfig struct {
Zone string
}
const (
oldRgwKeyName = "client.radosgw.gateway"
)
var updateDeploymentAndWait = mon.UpdateCephDeploymentAndWait
func (c *clusterConfig) createOrUpdateStore(realmName, zoneGroupName, zoneName string) error {
@@ -217,53 +213,9 @@ func (c *clusterConfig) startRGWPods(realmName, zoneGroupName, zoneName string)
}
}
c.deleteLegacyDaemons()
return nil
}
// deleteLegacyDaemons removes legacy rgw components that might have existed in Rook v1.0
func (c *clusterConfig) deleteLegacyDaemons() {
// Make a best effort to delete the rgw pods daemonsets
daemons, err := k8sutil.GetDaemonsets(c.context.Clientset, c.store.Namespace, c.storeLabelSelector())
if err != nil {
logger.Warningf("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err)
}
daemonsetNum := len(daemons.Items)
if daemonsetNum > 0 {
for _, d := range daemons.Items {
// Delete any existing daemonset
if err := k8sutil.DeleteDaemonset(c.context.Clientset, c.store.Namespace, d.Name); err != nil {
logger.Errorf("error during deletion of daemonset %q resource. %v", d.Name, err)
}
}
// Delete legacy rgw key
err = cephclient.AuthDelete(c.context, c.clusterInfo, oldRgwKeyName)
if err != nil {
logger.Infof("failed to delete legacy rgw key %q. %v", oldRgwKeyName, err)
}
}
// legacy deployment detection
logger.Debugf("looking for legacy deployment in object store %q", c.store.Name)
deps, err := k8sutil.GetDeployments(c.context.Clientset, c.store.Namespace, c.storeLabelSelector())
if err != nil {
logger.Warningf("could not get deployments for object store %q (matching label selector %q). %v", c.store.Name, c.storeLabelSelector(), err)
}
for _, d := range deps.Items {
if d.Name == instanceName(c.store.Name) {
logger.Infof("legacy deployment in object store %q found %q", c.store.Name, d.Name)
if err := k8sutil.DeleteDeployment(c.context.Clientset, c.store.Namespace, d.Name); err != nil {
logger.Warningf("error during deletion of deployment %q resource. %v", d.Name, err)
}
// Delete legacy rgw key
err = cephclient.AuthDelete(c.context, c.clusterInfo, oldRgwKeyName)
if err != nil {
logger.Infof("failed to delete legacy rgw key %q. %v", oldRgwKeyName, err)
}
}
}
}
// Delete the object store.
// WARNING: This is a very destructive action that deletes all metadata and data pools.
func (c *clusterConfig) deleteStore() error {