actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-19 14:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
Display proper revision for sources
This commit is contained in:
Hidde Beydals 2020-10-05 18:26:28 +02:00 committed by GitHub
commit 1c15eebd7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 9 deletions
Show stats 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",
} }