toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

app ls --status shows more detailles about the deployment state #280

Merged
moritz merged 8 commits from detailed_app_list into main 2023-03-07 12:32:19 +00:00
Conversation 1 Commits 8 Files Changed 5 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb33edaac3 - Show all commits

2
cli/updater/updater.go
View File

@ -403,7 +403,7 @@ func tryUpgrade(cl *dockerclient.Client, stackName, recipeName string, conf *run
return nil return nil
} }
updatesEnabled, err := getBoolLabel(cl, stackName, "autoupdate") updatesEnabled, err := getBoolLabel(cl, stackName, "auto-update")
if err != nil { if err != nil {
return err return err
} }

6
pkg/config/app.go
View File

@ -414,7 +414,7 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str
result["chaosVersion"] = chaosVersion result["chaosVersion"] = chaosVersion
} }
labelKey = fmt.Sprintf("coop-cloud.%s.autoupdate", name) labelKey = fmt.Sprintf("coop-cloud.%s.auto-update", name)
decentral1se marked this conversation as resolved Outdated
decentral1se commented 2023-03-05 10:25:11 +00:00
Outdated
Review
Copy Link

Is autoupdate -> auto-update potentially more readable?

Is `autoupdate` -> `auto-update` potentially more readable?
moritz commented 2023-03-07 12:18:08 +00:00
Outdated
Review
Copy Link

This would be a bit more readable but it would break kadabra for for all apps that are deployed with the current abra version.
Kadabra is still alpha, so breaking changes are part of it, but I don't think this label change is really worth the effort to redeploy all apps after the next abra release.

This would be a bit more readable but it would break kadabra for for all apps that are deployed with the current abra version. Kadabra is still alpha, so breaking changes are part of it, but I don't think this label change is really worth the effort to redeploy all apps after the next abra release.
👍 1
if autoUpdate, ok := service.Spec.Labels[labelKey]; ok { if autoUpdate, ok := service.Spec.Labels[labelKey]; ok {
result["autoUpdate"] = autoUpdate result["autoUpdate"] = autoUpdate
} else { } else {
@ -538,8 +538,8 @@ func SetUpdateLabel(compose *composetypes.Config, stackName string, appEnv AppEn
if !exists { if !exists {
enable_auto_update = "false" enable_auto_update = "false"
} }
logrus.Debugf("set label 'coop-cloud.%s.autoupdate' to %s for %s", stackName, enable_auto_update, stackName) logrus.Debugf("set label 'coop-cloud.%s.auto-update' to %s for %s", stackName, enable_auto_update, stackName)
labelKey := fmt.Sprintf("coop-cloud.%s.autoupdate", stackName) labelKey := fmt.Sprintf("coop-cloud.%s.auto-update", stackName)
service.Deploy.Labels[labelKey] = enable_auto_update service.Deploy.Labels[labelKey] = enable_auto_update
} }
} }