github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2955 from weaveworks/fix-replicaset-desiredreplicas

Browse Source 
fix incorrect reporting of replicaset DesiredReplicas
This commit is contained in:
Matthias Radestock
2017-12-01 15:04:12 +00:00
committed by GitHub
parent d6e47c0f5d 914acf6e3d
commit 2f4c6507e5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
probe/kubernetes/replica_set.go
View File

@@ -53,10 +53,15 @@ func (r *replicaSet) AddParent(topology, id string) {
}
func (r *replicaSet) GetNode(probeID string) report.Node {
// Spec.Replicas can be omitted, and the pointer will be nil. It defaults to 1.
desiredReplicas := 1
if r.Spec.Replicas != nil {
desiredReplicas = int(*r.Spec.Replicas)
}
return r.MetaNode(report.MakeReplicaSetNodeID(r.UID())).WithLatests(map[string]string{
ObservedGeneration: fmt.Sprint(r.Status.ObservedGeneration),
Replicas: fmt.Sprint(r.Status.Replicas),
DesiredReplicas: fmt.Sprint(r.Spec.Replicas),
DesiredReplicas: fmt.Sprint(desiredReplicas),
FullyLabeledReplicas: fmt.Sprint(r.Status.FullyLabeledReplicas),
report.ControlProbeID: probeID,
}).WithParents(r.parents).WithLatestActiveControls(ScaleUp, ScaleDown)