ceph: remove DaemonType type
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:
1 parent
7788901a88
commit
040193bb5a
21 files changed
+44
-66
No files matched your search
@@ -802,8 +802,7 @@ func (c *Cluster) updateMon(m *monConfig, d *apps.Deployment) error {
|
||||
logger.Infof("deployment for mon %s already exists. updating if needed",
|
||||
d.Name)
|
||||
|
||||
daemonType := string(config.MonType)
|
||||
err := updateDeploymentAndWait(c.context, d, c.Namespace, daemonType, m.DaemonName, c.spec.SkipUpgradeChecks, false)
|
||||
err := updateDeploymentAndWait(c.context, d, c.Namespace, config.MonType, m.DaemonName, c.spec.SkipUpgradeChecks, false)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to update mon deployment %s", m.ResourceName)
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ func (c *Cluster) makeMonDaemonContainer(monConfig *monConfig) v1.Container {
|
||||
k8sutil.PodIPEnvVar(podIPEnvVar),
|
||||
),
|
||||
Resources: cephv1.GetMonResources(c.spec.Resources),
|
||||
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(string(config.MonType), monConfig.DaemonName),
|
||||
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(config.MonType, monConfig.DaemonName),
|
||||
}
|
||||
|
||||
// If host networking is enabled, we don't need a bind addr that is different from the public addr
|
||||
|
||||
Reference in new issue
Block a user