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

ceph: remove DaemonType type

Browse Source 
This type was a string already and was just making us doing string()
calls all the time to it's not worth it.

Signed-off-by: Sébastien Han <seb@redhat.com>
This commit is contained in:
Sébastien Han committed 2020-04-01 09:08:18 +02:00
1 parent 7788901a88
commit 040193bb5a
21 files changed
+44 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pkg/operator/ceph/file/controller.go
+2 -3
View File
@@ -190,10 +190,9 @@ func (r *ReconcileCephFilesystem) reconcile(request reconcile.Request) (reconcil
r.clusterInfo = clusterInfo
// Populate CephVersion
daemon := string(opconfig.MonType)
currentCephVersion, err := cephclient.LeastUptodateDaemonVersion(r.context, r.clusterInfo.Name, daemon)
currentCephVersion, err := cephclient.LeastUptodateDaemonVersion(r.context, r.clusterInfo.Name, opconfig.MonType)
if err != nil {
return reconcile.Result{}, errors.Wrapf(err, "failed to retrieve current ceph %q version", daemon)
return reconcile.Result{}, errors.Wrapf(err, "failed to retrieve current ceph %q version", opconfig.MonType)
}
r.clusterInfo.CephVersion = currentCephVersion
pkg/operator/ceph/file/mds/mds.go
+1 -2
View File
@@ -186,8 +186,7 @@ func (c *Cluster) Start() error {
}
if createErr != nil && kerrors.IsAlreadyExists(createErr) {
daemon := string(config.MdsType)
if err = UpdateDeploymentAndWait(c.context, d, c.fs.Namespace, daemon, daemonLetterID, c.clusterSpec.SkipUpgradeChecks, c.clusterSpec.ContinueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
if err = UpdateDeploymentAndWait(c.context, d, c.fs.Namespace, config.MdsType, daemonLetterID, c.clusterSpec.SkipUpgradeChecks, c.clusterSpec.ContinueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
return errors.Wrapf(err, "failed to update mds deployment %s", d.Name)
}
}
pkg/operator/ceph/file/mds/spec.go
+1 -1
View File
@@ -120,7 +120,7 @@ func (c *Cluster) makeMdsDaemonContainer(mdsConfig *mdsConfig) v1.Container {
),
Resources: c.fs.Spec.MetadataServer.Resources,
SecurityContext: mon.PodSecurityContext(),
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(string(config.MdsType), mdsConfig.DaemonID),
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(config.MdsType, mdsConfig.DaemonID),
}
return container