Add chart & version to list cmd output (#1731)
This commit is contained in:
parent
b7d6639b25
commit
5ce755e4d8
|
|
@ -61,6 +61,8 @@ type HelmRelease struct {
|
||||||
Namespace string `json:"namespace"`
|
Namespace string `json:"namespace"`
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
Labels string `json:"labels"`
|
Labels string `json:"labels"`
|
||||||
|
Chart string `json:"chart"`
|
||||||
|
Version string `json:"version"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(conf ConfigProvider) *App {
|
func New(conf ConfigProvider) *App {
|
||||||
|
|
@ -509,6 +511,8 @@ func (a *App) ListReleases(c ListConfigProvider) error {
|
||||||
Namespace: r.Namespace,
|
Namespace: r.Namespace,
|
||||||
Enabled: installed,
|
Enabled: installed,
|
||||||
Labels: labels,
|
Labels: labels,
|
||||||
|
Chart: r.Chart,
|
||||||
|
Version: r.Version,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -4519,11 +4519,11 @@ releases:
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
})
|
})
|
||||||
|
|
||||||
expected := `NAME NAMESPACE ENABLED LABELS
|
expected := `NAME NAMESPACE ENABLED LABELS CHART VERSION
|
||||||
myrelease1 false common:label,id:myrelease1
|
myrelease1 false common:label,id:myrelease1 mychart1
|
||||||
myrelease2 true common:label
|
myrelease2 true common:label mychart1
|
||||||
myrelease3 true
|
myrelease3 true mychart1
|
||||||
myrelease4 true id:myrelease1
|
myrelease4 true id:myrelease1 mychart1
|
||||||
`
|
`
|
||||||
assert.Equal(t, expected, out)
|
assert.Equal(t, expected, out)
|
||||||
}
|
}
|
||||||
|
|
@ -4576,7 +4576,7 @@ releases:
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
})
|
})
|
||||||
|
|
||||||
expected := `[{"name":"myrelease1","namespace":"","enabled":false,"labels":"id:myrelease1"},{"name":"myrelease2","namespace":"","enabled":true,"labels":""},{"name":"myrelease3","namespace":"","enabled":true,"labels":""},{"name":"myrelease4","namespace":"","enabled":true,"labels":"id:myrelease1"}]
|
expected := `[{"name":"myrelease1","namespace":"","enabled":false,"labels":"id:myrelease1","chart":"mychart1","version":""},{"name":"myrelease2","namespace":"","enabled":true,"labels":"","chart":"mychart1","version":""},{"name":"myrelease3","namespace":"","enabled":true,"labels":"","chart":"mychart1","version":""},{"name":"myrelease4","namespace":"","enabled":true,"labels":"id:myrelease1","chart":"mychart1","version":""}]
|
||||||
`
|
`
|
||||||
assert.Equal(t, expected, out)
|
assert.Equal(t, expected, out)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,10 @@ import (
|
||||||
|
|
||||||
func FormatAsTable(releases []*HelmRelease) error {
|
func FormatAsTable(releases []*HelmRelease) error {
|
||||||
table := uitable.New()
|
table := uitable.New()
|
||||||
table.AddRow("NAME", "NAMESPACE", "ENABLED", "LABELS")
|
table.AddRow("NAME", "NAMESPACE", "ENABLED", "LABELS", "CHART", "VERSION")
|
||||||
|
|
||||||
for _, r := range releases {
|
for _, r := range releases {
|
||||||
table.AddRow(r.Name, r.Namespace, fmt.Sprintf("%t", r.Enabled), r.Labels)
|
table.AddRow(r.Name, r.Namespace, fmt.Sprintf("%t", r.Enabled), r.Labels, r.Chart, r.Version)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println(table.String())
|
fmt.Println(table.String())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue