Commit 55aee177 authored by Sébastien Han's avatar Sébastien Han
Browse files

ceph: don't hardcode ContinueUpgradeAfterChecksEvenIfNotHealthy


Let's just read the given value from the spec.
Signed-off-by: default avatarSébastien Han <seb@redhat.com>
parent 80dd249e
Showing with 2 additions and 2 deletions
+2 -2
......@@ -187,7 +187,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, false); err != nil {
if err = UpdateDeploymentAndWait(c.context, d, c.fs.Namespace, daemon, daemonLetterID, c.clusterSpec.SkipUpgradeChecks, c.clusterSpec.ContinueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
return errors.Wrapf(err, "failed to update mds deployment %s", d.Name)
}
}
......
......@@ -165,7 +165,7 @@ 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) {
daemon := string(config.RgwType)
if err := updateDeploymentAndWait(c.context, deployment, c.store.Namespace, daemon, daemonLetterID, c.skipUpgradeChecks, false); err != nil {
if err := updateDeploymentAndWait(c.context, deployment, c.store.Namespace, daemon, daemonLetterID, c.skipUpgradeChecks, c.clusterSpec.ContinueUpgradeAfterChecksEvenIfNotHealthy); err != nil {
return errors.Wrapf(err, "failed to update object store %q deployment %q", c.store.Name, deployment.Name)
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment