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
@@ -492,9 +492,7 @@ func (c *Cluster) startOSDDaemonsOnPVC(pvcName string, config *provisionConfig,
|
||||
}
|
||||
|
||||
if createErr != nil && kerrors.IsAlreadyExists(createErr) {
|
||||
daemon := string(opconfig.OsdType)
|
||||
|
||||
if err = updateDeploymentAndWait(c.context, dp, c.Namespace, daemon, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
|
||||
if err = updateDeploymentAndWait(c.context, dp, c.Namespace, opconfig.OsdType, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
|
||||
logger.Errorf("failed to update osd deployment %d. %+v", osd.ID, err)
|
||||
}
|
||||
}
|
||||
@@ -574,8 +572,7 @@ func (c *Cluster) startOSDDaemonsOnNode(nodeName string, config *provisionConfig
|
||||
}
|
||||
|
||||
if createErr != nil && kerrors.IsAlreadyExists(createErr) {
|
||||
daemon := string(opconfig.OsdType)
|
||||
if err = updateDeploymentAndWait(c.context, dp, c.Namespace, daemon, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
|
||||
if err = updateDeploymentAndWait(c.context, dp, c.Namespace, opconfig.OsdType, strconv.Itoa(osd.ID), c.skipUpgradeChecks, c.continueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
|
||||
logger.Errorf("failed to update osd deployment %d. %+v", osd.ID, err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -462,7 +462,7 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo, provisionC
|
||||
Env: envVars,
|
||||
Resources: osdProps.resources,
|
||||
SecurityContext: securityContext,
|
||||
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(string(opconfig.OsdType), osdID),
|
||||
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(opconfig.OsdType, osdID),
|
||||
},
|
||||
},
|
||||
Volumes: volumes,
|
||||
|
||||
Reference in new issue
Block a user