Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-13 21:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display proper revision for sources

Browse Source 
Includes a change to an empty revision string if the reconciler has not
produced an artifact yet, as this will otherwise result in a nil
pointer dereference.
This commit is contained in:
Hidde Beydals
2020-10-05 18:05:11 +02:00
parent d41bd6b6b1
commit f3cab6e177
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/gotk/get_source_bucket.go
View File

@@ -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",
} }

10
cmd/gotk/get_source_git.go
View File

@@ -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",
} }

10
cmd/gotk/get_source_helm.go
View File

@@ -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",
} }