Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add number of instances to describe command #1289

Merged
merged 1 commit into from
Apr 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/kn/commands/revision/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ func describe(w io.Writer, revision *servingv1.Revision, service *servingv1.Serv
dw := printers.NewPrefixWriter(w)
commands.WriteMetadata(dw, &revision.ObjectMeta, printDetails)
WriteImage(dw, revision)
WriteReplicas(dw, revision)
WritePort(dw, revision)
WriteEnv(dw, revision, printDetails)
WriteEnvFrom(dw, revision, printDetails)
Expand Down Expand Up @@ -202,6 +203,14 @@ func WriteEnvFrom(dw printers.PrefixWriter, revision *servingv1.Revision, printD
}
}

func WriteReplicas(dw printers.PrefixWriter, revision *servingv1.Revision) {
actualReplicas := revision.Status.ActualReplicas
desiredReplicas := revision.Status.DesiredReplicas
if actualReplicas != 0 || desiredReplicas != 0 {
dw.WriteAttribute("Replicas", fmt.Sprintf("%d/%d", actualReplicas, desiredReplicas))
}
}

func WriteScale(dw printers.PrefixWriter, revision *servingv1.Revision) {
// Scale spec if given
scale, err := clientserving.ScalingInfo(&revision.ObjectMeta)
Expand Down
3 changes: 3 additions & 0 deletions pkg/kn/commands/revision/describe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func TestDescribeRevisionBasic(t *testing.T) {
}

assert.Assert(t, util.ContainsAll(data, "Image:", "gcr.io/test/image", "++ Ready", "Port:", "8080"))
assert.Assert(t, util.ContainsAll(data, "Replicas:", "0/1"))
assert.Assert(t, util.ContainsAll(data, "EnvFrom:", "cm:test1, cm:test2"))
}

Expand Down Expand Up @@ -161,6 +162,8 @@ func createTestRevision(revision string, gen int64) servingv1.Revision {
},
},
Status: servingv1.RevisionStatus{
ActualReplicas: 0,
DesiredReplicas: 1,
DeprecatedImageDigest: "gcr.io/test/image@" + imageDigest,
Status: duckv1.Status{
Conditions: goodConditions(),
Expand Down
1 change: 1 addition & 0 deletions pkg/kn/commands/service/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ func writeRevisions(dw printers.PrefixWriter, revisions []*revisionDesc, printDe
section.WriteAttribute("Error", ready.Reason)
}
revision.WriteImage(section, revisionDesc.revision)
revision.WriteReplicas(section, revisionDesc.revision)
if printDetails {
revision.WritePort(section, revisionDesc.revision)
revision.WriteEnv(section, revisionDesc.revision, printDetails)
Expand Down
3 changes: 3 additions & 0 deletions pkg/kn/commands/service/describe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ func TestServiceDescribeBasic(t *testing.T) {
assert.Assert(t, util.ContainsAll(output, "Labels:", "label1=lval1, label2=lval2\n"))
assert.Assert(t, util.ContainsAll(output, "[1]"))
assert.Assert(t, cmp.Regexp("Service Account: \\s+default-sa", output))
assert.Assert(t, util.ContainsAll(output, "Replicas:", "0/1"))

assert.Equal(t, strings.Count(output, "rev1"), 1)

Expand Down Expand Up @@ -762,6 +763,8 @@ func createTestRevision(revision string, gen int64, conditions duckv1.Conditions
},
},
Status: servingv1.RevisionStatus{
ActualReplicas: 0,
DesiredReplicas: 1,
DeprecatedImageDigest: "gcr.io/test/image@" + imageDigest,
Status: duckv1.Status{
Conditions: conditions,
Expand Down