Merge pull request #307 from fluxcd/bugfix-get-source

Display proper revision for sources
pull/310/head
Hidde Beydals 5 years ago committed by GitHub
commit 1c15eebd7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -72,18 +72,22 @@ func getSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
} }
var rows [][]string var rows [][]string
for _, source := range list.Items { for _, source := range list.Items {
row := []string{} var row []string
var revision string
if source.GetArtifact() != nil {
revision = source.GetArtifact().Revision
}
if c := meta.GetCondition(source.Status.Conditions, meta.ReadyCondition); c != nil { if c := meta.GetCondition(source.Status.Conditions, meta.ReadyCondition); c != nil {
row = []string{ row = []string{
source.GetName(), source.GetName(),
source.GetArtifact().Revision, revision,
string(c.Status), string(c.Status),
c.Message, c.Message,
} }
} else { } else {
row = []string{ row = []string{
source.GetName(), source.GetName(),
source.GetArtifact().Revision, revision,
string(corev1.ConditionFalse), string(corev1.ConditionFalse),
"waiting to be reconciled", "waiting to be reconciled",
} }

@ -72,18 +72,22 @@ func getSourceGitCmdRun(cmd *cobra.Command, args []string) error {
} }
var rows [][]string var rows [][]string
for _, source := range list.Items { for _, source := range list.Items {
row := []string{} var row []string
var revision string
if source.GetArtifact() != nil {
revision = source.GetArtifact().Revision
}
if c := meta.GetCondition(source.Status.Conditions, meta.ReadyCondition); c != nil { if c := meta.GetCondition(source.Status.Conditions, meta.ReadyCondition); c != nil {
row = []string{ row = []string{
source.GetName(), source.GetName(),
"unknown", revision,
string(c.Status), string(c.Status),
c.Message, c.Message,
} }
} else { } else {
row = []string{ row = []string{
source.GetName(), source.GetName(),
source.GetArtifact().Revision, revision,
string(corev1.ConditionFalse), string(corev1.ConditionFalse),
"waiting to be reconciled", "waiting to be reconciled",
} }

@ -72,18 +72,22 @@ func getSourceHelmCmdRun(cmd *cobra.Command, args []string) error {
} }
var rows [][]string var rows [][]string
for _, source := range list.Items { for _, source := range list.Items {
row := []string{} var row []string
var revision string
if source.GetArtifact() != nil {
revision = source.GetArtifact().Revision
}
if c := meta.GetCondition(source.Status.Conditions, meta.ReadyCondition); c != nil { if c := meta.GetCondition(source.Status.Conditions, meta.ReadyCondition); c != nil {
row = []string{ row = []string{
source.GetName(), source.GetName(),
source.GetArtifact().Revision, revision,
string(c.Status), string(c.Status),
c.Message, c.Message,
} }
} else { } else {
row = []string{ row = []string{
source.GetName(), source.GetName(),
source.GetArtifact().Revision, revision,
string(corev1.ConditionFalse), string(corev1.ConditionFalse),
"waiting to be reconciled", "waiting to be reconciled",
} }

Loading…
Cancel
Save