diff --git a/pkg/operator/ceph/cluster/mgr/mgr.go b/pkg/operator/ceph/cluster/mgr/mgr.go index 4e5798a51..5b0ae8ee3 100644 --- a/pkg/operator/ceph/cluster/mgr/mgr.go +++ b/pkg/operator/ceph/cluster/mgr/mgr.go @@ -182,21 +182,8 @@ func (c *Cluster) Start() error { } logger.Infof("deployment for mgr %s already exists. updating if needed", resourceName) - // Always invoke ceph version before an upgrade so we are sure to be up-to-date daemon := string(config.MgrType) - var cephVersionToUse cephver.CephVersion - - currentCephVersion, err := client.LeastUptodateDaemonVersion(c.context, c.clusterInfo.Name, daemon) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %+v", daemon, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", c.clusterInfo.CephVersion) - cephVersionToUse = c.clusterInfo.CephVersion - } else { - logger.Debugf("current cluster version for mgrs before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - - if err := updateDeploymentAndWait(c.context, d, c.Namespace, daemon, mgrConfig.DaemonID, cephVersionToUse, c.skipUpgradeChecks, false); err != nil { + if err := updateDeploymentAndWait(c.context, d, c.Namespace, daemon, mgrConfig.DaemonID, c.skipUpgradeChecks, false); err != nil { logger.Errorf("failed to update mgr deployment %q. %+v", resourceName, err) } } diff --git a/pkg/operator/ceph/cluster/mon/mon.go b/pkg/operator/ceph/cluster/mon/mon.go index b47e21bf4..eb8304108 100644 --- a/pkg/operator/ceph/cluster/mon/mon.go +++ b/pkg/operator/ceph/cluster/mon/mon.go @@ -803,19 +803,7 @@ func (c *Cluster) updateMon(m *monConfig, d *apps.Deployment) error { d.Name) daemonType := string(config.MonType) - var cephVersionToUse cephver.CephVersion - - currentCephVersion, err := client.LeastUptodateDaemonVersion(c.context, c.ClusterInfo.Name, daemonType) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %+v", daemonType, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", c.ClusterInfo.CephVersion) - cephVersionToUse = c.ClusterInfo.CephVersion - } else { - logger.Debugf("current cluster version for monitors before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - - err = updateDeploymentAndWait(c.context, d, c.Namespace, daemonType, m.DaemonName, cephVersionToUse, c.spec.SkipUpgradeChecks, false) + err := updateDeploymentAndWait(c.context, d, c.Namespace, daemonType, m.DaemonName, c.spec.SkipUpgradeChecks, false) if err != nil { return errors.Wrapf(err, "failed to update mon deployment %s", m.ResourceName) } diff --git a/pkg/operator/ceph/cluster/mon/spec.go b/pkg/operator/ceph/cluster/mon/spec.go index e763077c6..9d5f997a9 100644 --- a/pkg/operator/ceph/cluster/mon/spec.go +++ b/pkg/operator/ceph/cluster/mon/spec.go @@ -27,7 +27,6 @@ import ( "github.com/rook/rook/pkg/daemon/ceph/client" "github.com/rook/rook/pkg/operator/ceph/config" "github.com/rook/rook/pkg/operator/ceph/controller" - cephver "github.com/rook/rook/pkg/operator/ceph/version" "github.com/rook/rook/pkg/operator/k8sutil" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -289,7 +288,7 @@ func (c *Cluster) makeMonDaemonContainer(monConfig *monConfig) v1.Container { } // UpdateCephDeploymentAndWait verifies a deployment can be stopped or continued -func UpdateCephDeploymentAndWait(context *clusterd.Context, deployment *apps.Deployment, namespace, daemonType, daemonName string, cephVersion cephver.CephVersion, skipUpgradeChecks, continueUpgradeAfterChecksEvenIfNotHealthy bool) error { +func UpdateCephDeploymentAndWait(context *clusterd.Context, deployment *apps.Deployment, namespace, daemonType, daemonName string, skipUpgradeChecks, continueUpgradeAfterChecksEvenIfNotHealthy bool) error { callback := func(action string) error { // At this point, we are in an upgrade diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index 4fbed0362..8a52619f9 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -492,21 +492,9 @@ func (c *Cluster) startOSDDaemonsOnPVC(pvcName string, config *provisionConfig, } if createErr != nil && kerrors.IsAlreadyExists(createErr) { - // Always invoke ceph version before an upgrade so we are sure to be up-to-date daemon := string(opconfig.OsdType) - var cephVersionToUse cephver.CephVersion - currentCephVersion, err := client.LeastUptodateDaemonVersion(c.context, c.clusterInfo.Name, daemon) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %+v", daemon, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", c.clusterInfo.CephVersion) - cephVersionToUse = c.clusterInfo.CephVersion - } else { - logger.Debugf("current cluster version for osds before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - - if err = updateDeploymentAndWait(c.context, dp, c.Namespace, daemon, strconv.Itoa(osd.ID), cephVersionToUse, c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil { + if err = updateDeploymentAndWait(c.context, dp, c.Namespace, daemon, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil { logger.Errorf("failed to update osd deployment %d. %+v", osd.ID, err) } } @@ -586,21 +574,8 @@ func (c *Cluster) startOSDDaemonsOnNode(nodeName string, config *provisionConfig } if createErr != nil && kerrors.IsAlreadyExists(createErr) { - // Always invoke ceph version before an upgrade so we are sure to be up-to-date daemon := string(opconfig.OsdType) - var cephVersionToUse cephver.CephVersion - - currentCephVersion, err := client.LeastUptodateDaemonVersion(c.context, c.clusterInfo.Name, daemon) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %+v", daemon, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", c.clusterInfo.CephVersion) - cephVersionToUse = c.clusterInfo.CephVersion - } else { - logger.Debugf("current cluster version for osds before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - - if err = updateDeploymentAndWait(c.context, dp, c.Namespace, daemon, strconv.Itoa(osd.ID), cephVersionToUse, c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil { + if err = updateDeploymentAndWait(c.context, dp, c.Namespace, daemon, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil { logger.Errorf("failed to update osd deployment %d. %+v", osd.ID, err) } } diff --git a/pkg/operator/ceph/cluster/rbd/mirror.go b/pkg/operator/ceph/cluster/rbd/mirror.go index 2258de81a..2ec9cac06 100644 --- a/pkg/operator/ceph/cluster/rbd/mirror.go +++ b/pkg/operator/ceph/cluster/rbd/mirror.go @@ -26,12 +26,10 @@ import ( cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" rookv1 "github.com/rook/rook/pkg/apis/rook.io/v1" "github.com/rook/rook/pkg/clusterd" - "github.com/rook/rook/pkg/daemon/ceph/client" cephconfig "github.com/rook/rook/pkg/daemon/ceph/config" "github.com/rook/rook/pkg/operator/ceph/cluster/mon" "github.com/rook/rook/pkg/operator/ceph/config" "github.com/rook/rook/pkg/operator/ceph/controller" - cephver "github.com/rook/rook/pkg/operator/ceph/version" "github.com/rook/rook/pkg/operator/k8sutil" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -140,23 +138,9 @@ func (m *Mirroring) Start() error { } logger.Infof("deployment for rbd-mirror %s already exists. updating if needed", resourceName) - // Always invoke ceph version before an upgrade so we are sure to be up-to-date daemon := string(config.RbdMirrorType) - var cephVersionToUse cephver.CephVersion - // If this is not a Ceph upgrade there is no need to check the ceph version - currentCephVersion, err := client.LeastUptodateDaemonVersion(m.context, m.ClusterInfo.Name, daemon) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %+v", daemon, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", m.ClusterInfo.CephVersion) - cephVersionToUse = m.ClusterInfo.CephVersion - - } else { - logger.Debugf("current cluster version for rbd mirrors before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - - if err := updateDeploymentAndWait(m.context, d, m.Namespace, daemon, daemonConf.DaemonID, cephVersionToUse, m.skipUpgradeChecks, false); err != nil { + if err := updateDeploymentAndWait(m.context, d, m.Namespace, daemon, daemonConf.DaemonID, m.skipUpgradeChecks, false); err != nil { // fail could be an issue updating label selector (immutable), so try del and recreate logger.Debugf("updateDeploymentAndWait failed for rbd-mirror %q. Attempting del-and-recreate. %v", resourceName, err) err = m.context.Clientset.AppsV1().Deployments(m.Namespace).Delete(d.Name, &metav1.DeleteOptions{}) diff --git a/pkg/operator/ceph/file/mds/mds.go b/pkg/operator/ceph/file/mds/mds.go index 98b409bc8..f36daab6a 100644 --- a/pkg/operator/ceph/file/mds/mds.go +++ b/pkg/operator/ceph/file/mds/mds.go @@ -184,20 +184,8 @@ func (c *Cluster) Start() error { // keyring must be generated before update-and-wait since no keyring will prevent the // deployment from reaching ready state if createErr != nil && kerrors.IsAlreadyExists(createErr) { - // Always invoke ceph version before an upgrade so we are sure to be up-to-date daemon := string(config.MdsType) - var cephVersionToUse cephver.CephVersion - currentCephVersion, err := client.LeastUptodateDaemonVersion(c.context, c.clusterInfo.Name, daemon) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %v", daemon, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", c.clusterInfo.CephVersion) - cephVersionToUse = c.clusterInfo.CephVersion - - } else { - logger.Debugf("current cluster version for mdss before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - if err = UpdateDeploymentAndWait(c.context, d, c.fs.Namespace, daemon, daemonLetterID, cephVersionToUse, c.clusterSpec.SkipUpgradeChecks, false); err != nil { + if err = UpdateDeploymentAndWait(c.context, d, c.fs.Namespace, daemon, daemonLetterID, c.clusterSpec.SkipUpgradeChecks, false); err != nil { return errors.Wrapf(err, "failed to update mds deployment %s", d.Name) } } diff --git a/pkg/operator/ceph/nfs/nfs.go b/pkg/operator/ceph/nfs/nfs.go index 8f05fa06f..8447f6ee2 100644 --- a/pkg/operator/ceph/nfs/nfs.go +++ b/pkg/operator/ceph/nfs/nfs.go @@ -98,8 +98,7 @@ func (c *CephNFSController) upCephNFS(n cephv1.CephNFS, oldActive int) error { return errors.Wrapf(err, "failed to create ganesha deployment") } logger.Infof("ganesha deployment %s already exists. updating if needed", deployment.Name) - // We don't invoke ceph versions here since nfs do not show up in the service map (yet?) - if err := updateDeploymentAndWait(c.context, deployment, n.Namespace, "nfs", id, c.clusterInfo.CephVersion, c.clusterSpec.SkipUpgradeChecks, false); err != nil { + if err := updateDeploymentAndWait(c.context, deployment, n.Namespace, "nfs", id, c.clusterSpec.SkipUpgradeChecks, false); err != nil { return errors.Wrapf(err, "failed to update ganesha deployment %q", deployment.Name) } } else { diff --git a/pkg/operator/ceph/object/rgw.go b/pkg/operator/ceph/object/rgw.go index bd78f0d3d..1ee15365d 100644 --- a/pkg/operator/ceph/object/rgw.go +++ b/pkg/operator/ceph/object/rgw.go @@ -30,7 +30,6 @@ import ( "github.com/rook/rook/pkg/operator/ceph/cluster/mon" "github.com/rook/rook/pkg/operator/ceph/config" "github.com/rook/rook/pkg/operator/ceph/pool" - cephver "github.com/rook/rook/pkg/operator/ceph/version" "github.com/rook/rook/pkg/operator/k8sutil" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -174,20 +173,8 @@ func (c *clusterConfig) startRGWPods() error { // Generate the mime.types file after the rep. controller as well for the same reason as keyring if createErr != nil && kerrors.IsAlreadyExists(createErr) { - // Always invoke ceph version before an upgrade so we are sure to be up-to-date daemon := string(config.RgwType) - var cephVersionToUse cephver.CephVersion - currentCephVersion, err := client.LeastUptodateDaemonVersion(c.context, c.clusterInfo.Name, daemon) - if err != nil { - logger.Warningf("failed to retrieve current ceph %q version. %v", daemon, err) - logger.Debug("could not detect ceph version during update, this is likely an initial bootstrap, proceeding with %+v", c.clusterInfo.CephVersion) - cephVersionToUse = c.clusterInfo.CephVersion - - } else { - logger.Debugf("current cluster version for rgws before upgrading is: %+v", currentCephVersion) - cephVersionToUse = currentCephVersion - } - if err := updateDeploymentAndWait(c.context, deployment, c.store.Namespace, daemon, daemonLetterID, cephVersionToUse, c.skipUpgradeChecks, false); err != nil { + if err := updateDeploymentAndWait(c.context, deployment, c.store.Namespace, daemon, daemonLetterID, c.skipUpgradeChecks, false); err != nil { return errors.Wrapf(err, "failed to update object store %q deployment %q", c.store.Name, deployment.Name) } } diff --git a/pkg/operator/k8sutil/test/deployment.go b/pkg/operator/k8sutil/test/deployment.go index 5a0ac0e06..0dd451c22 100644 --- a/pkg/operator/k8sutil/test/deployment.go +++ b/pkg/operator/k8sutil/test/deployment.go @@ -2,7 +2,6 @@ package test import ( "github.com/rook/rook/pkg/clusterd" - "github.com/rook/rook/pkg/operator/ceph/version" apps "k8s.io/api/apps/v1" ) @@ -15,11 +14,11 @@ import ( // returns a pointer to this slice which the calling func may use to verify the expected contents of // deploymentsUpdated based on expected behavior. func UpdateDeploymentAndWaitStub() ( - stubFunc func(context *clusterd.Context, deployment *apps.Deployment, namespace, daemonType, daemonName string, cephVersion version.CephVersion, skipUpgradeChecks, continueUpgradeAfterChecksEvenIfNotHealthy bool) error, + stubFunc func(context *clusterd.Context, deployment *apps.Deployment, namespace, daemonType, daemonName string, skipUpgradeChecks, continueUpgradeAfterChecksEvenIfNotHealthy bool) error, deploymentsUpdated *[]*apps.Deployment, ) { deploymentsUpdated = &[]*apps.Deployment{} - stubFunc = func(context *clusterd.Context, deployment *apps.Deployment, namespace, daemonType, daemonName string, cephVersion version.CephVersion, skipUpgradeChecks, continueUpgradeAfterChecksEvenIfNotHealthy bool) error { + stubFunc = func(context *clusterd.Context, deployment *apps.Deployment, namespace, daemonType, daemonName string, skipUpgradeChecks, continueUpgradeAfterChecksEvenIfNotHealthy bool) error { *deploymentsUpdated = append(*deploymentsUpdated, deployment) return nil }