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
1 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 e9879e2226 - Show all commits

8
pkg/config/app.go
View File

@ -409,7 +409,7 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str
result["chaos"] = chaos result["chaos"] = chaos
} }
labelKey = fmt.Sprintf("coop-cloud.%s.chaos_version", name) labelKey = fmt.Sprintf("coop-cloud.%s.chaos-version", name)
moritz marked this conversation as resolved Outdated
decentral1se commented 2023-03-05 10:24:23 +00:00
Outdated
Review
Copy Link

chaos_version -> chaos-version following the convention of -? This would require updating in several places in this PR.

`chaos_version` -> `chaos-version` following the convention of `-`? This would require updating in several places in this PR.
if chaosVersion, ok := service.Spec.Labels[labelKey]; ok { if chaosVersion, ok := service.Spec.Labels[labelKey]; ok {
result["chaosVersion"] = chaosVersion result["chaosVersion"] = chaosVersion
} }
@ -517,12 +517,12 @@ func SetChaosLabel(compose *composetypes.Config, stackName string, chaos bool) {
} }
} }
// SetChaosVersionLabel adds the label 'coop-cloud.${STACK_NAME}.chaos_version=$(GIT_COMMIT)' to the app container // SetChaosVersionLabel adds the label 'coop-cloud.${STACK_NAME}.chaos-version=$(GIT_COMMIT)' to the app container
func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosVersion string) { func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosVersion string) {
for _, service := range compose.Services { for _, service := range compose.Services {
if service.Name == "app" { if service.Name == "app" {
logrus.Debugf("set label 'coop-cloud.%s.chaos_version' to %v for %s", stackName, chaosVersion, stackName) logrus.Debugf("set label 'coop-cloud.%s.chaos-version' to %v for %s", stackName, chaosVersion, stackName)
labelKey := fmt.Sprintf("coop-cloud.%s.chaos_version", stackName) labelKey := fmt.Sprintf("coop-cloud.%s.chaos-version", stackName)
service.Deploy.Labels[labelKey] = chaosVersion service.Deploy.Labels[labelKey] = chaosVersion
} }
} }