forked from coop-cloud/abra
fix: force flag works for upgrade
This commit is contained in:
parent
63318fb6ff
commit
6d4ee3de0d
|
@ -67,7 +67,7 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(versions) == 0 {
|
if len(versions) == 0 && !internal.Chaos {
|
||||||
logrus.Fatalf("no versions available '%s' in recipe catalogue?", app.Type)
|
logrus.Fatalf("no versions available '%s' in recipe catalogue?", app.Type)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,13 +93,14 @@ recipes.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(availableUpgrades) == 0 {
|
if len(availableUpgrades) == 0 && !internal.Force {
|
||||||
logrus.Fatal("no available upgrades, you're on latest")
|
logrus.Fatal("no available upgrades, you're on latest")
|
||||||
|
availableUpgrades = versions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var chosenUpgrade string
|
var chosenUpgrade string
|
||||||
if !internal.Chaos {
|
if len(availableUpgrades) > 0 && !internal.Chaos {
|
||||||
if internal.Force {
|
if internal.Force {
|
||||||
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
|
||||||
logrus.Debugf("choosing '%s' as version to upgrade to", chosenUpgrade)
|
logrus.Debugf("choosing '%s' as version to upgrade to", chosenUpgrade)
|
||||||
|
@ -153,10 +154,8 @@ recipes.
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !internal.Force {
|
if err := NewVersionOverview(app, deployedVersion, chosenUpgrade); err != nil {
|
||||||
if err := NewVersionOverview(app, deployedVersion, chosenUpgrade); err != nil {
|
logrus.Fatal(err)
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
|
if err := stack.RunDeploy(cl, deployOpts, compose); err != nil {
|
||||||
|
|
Loading…
Reference in New Issue