Skip to content

Commit e8c664b

Browse files
Fix sync status on logic ents (#88)
* bump * bump sdk
1 parent 931858e commit e8c664b

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

cmd/commands/runtime.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -426,21 +426,19 @@ func RunRuntimeList(ctx context.Context) error {
426426
}
427427

428428
tb := ansiterm.NewTabWriter(os.Stdout, 0, 0, 4, ' ', 0)
429-
_, err = fmt.Fprintln(tb, "NAME\tNAMESPACE\tCLUSTER\tSTATUS\tVERSION")
429+
_, err = fmt.Fprintln(tb, "NAME\tNAMESPACE\tCLUSTER\tVERSION\tSYNC_STATUS\tHEALTH_STATUS\tHEALTH_MESSAGE")
430430
if err != nil {
431431
return err
432432
}
433433

434434
for _, rt := range runtimes {
435-
status := "N/A"
435+
name := rt.Metadata.Name
436436
namespace := "N/A"
437437
cluster := "N/A"
438-
name := rt.Metadata.Name
439438
version := "N/A"
440-
441-
if rt.Self.HealthMessage != nil {
442-
status = *rt.Self.HealthMessage
443-
}
439+
syncStatus := rt.SyncStatus
440+
healthStatus := rt.HealthStatus
441+
healthMessage := "N/A"
444442

445443
if rt.Metadata.Namespace != nil {
446444
namespace = *rt.Metadata.Namespace
@@ -454,12 +452,18 @@ func RunRuntimeList(ctx context.Context) error {
454452
version = *rt.RuntimeVersion
455453
}
456454

457-
_, err = fmt.Fprintf(tb, "%s\t%s\t%s\t%s\t%s\n",
455+
if rt.HealthMessage != nil {
456+
healthMessage = *rt.HealthMessage
457+
}
458+
459+
_, err = fmt.Fprintf(tb, "%s\t%s\t%s\t%s\t%s\t%s\t%s\n",
458460
name,
459461
namespace,
460462
cluster,
461-
status,
462463
version,
464+
syncStatus,
465+
healthStatus,
466+
healthMessage,
463467
)
464468
if err != nil {
465469
return err
@@ -818,7 +822,6 @@ func updateProject(repofs fs.FS, rt *runtime.Runtime) error {
818822
project.ObjectMeta.Labels = make(map[string]string)
819823
}
820824

821-
822825
project.ObjectMeta.Labels[store.Get().LabelKeyCFType] = store.Get().CFRuntimeType
823826

824827
return repofs.WriteYamls(projPath, project, appset)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/argoproj/argo-events v1.4.0
1111
github.com/argoproj/argo-workflows/v3 v3.1.6
1212
github.com/briandowns/spinner v1.16.0
13-
github.com/codefresh-io/go-sdk v0.34.0
13+
github.com/codefresh-io/go-sdk v0.34.2
1414
github.com/fatih/color v1.12.0
1515
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1616
github.com/go-git/go-billy/v5 v5.3.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
268268
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
269269
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
270270
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
271-
github.com/codefresh-io/go-sdk v0.34.0 h1:JvY71ZTu23F+mHrG+MiqLyUqNlvUAiVUzXjJHUFoP+I=
272-
github.com/codefresh-io/go-sdk v0.34.0/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
271+
github.com/codefresh-io/go-sdk v0.34.2 h1:tdkCTr9622ZE4yeT3E4wQaUDOnaQeftAwQS0DeQPC3s=
272+
github.com/codefresh-io/go-sdk v0.34.2/go.mod h1:CcoVmTFWHGkbrSW8LyOGB/vJe5Vzr3iC/pNE2QIBTyg=
273273
github.com/colinmarc/hdfs v1.1.4-0.20180802165501-48eb8d6c34a9/go.mod h1:0DumPviB681UcSuJErAbDIOx6SIaJWj463TymfZG02I=
274274
github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31/go.mod h1:vSBumefK4HA5uiRSwNP+3ofgrEoScpCS2MMWcWXEuQ4=
275275
github.com/container-storage-interface/spec v1.3.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=

0 commit comments

Comments
 (0)