openkruise
/
kruise-state-metrics
mirror of https://github.com/openkruise/kruise-state-metrics.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

一些bug修复 (#10) 

* Fix nil pointer

Signed-off-by: shijieqin <qsj4work@gmail.com>

* Fix Naming conventions for kruise_sidecarset_status_replicas_ready

Signed-off-by: shijieqin <qsj4work@gmail.com>
This commit is contained in:
秦世杰 2022-01-19 14:30:52 +08:00 committed by GitHub
parent 47cf599d52
commit 1efd962143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/store/cloneset.go
View File

@ -173,7 +173,11 @@ func cloneSetMetricFamilies(allowAnnotationsList, allowLabelsList []string) []ge
metric.Gauge,
"",
wrapCloneSetFunc(func(cs *v1alpha1.CloneSet) *metric.Family {
maxUnavailable, err := intstr.GetValueFromIntOrPercent(cs.Spec.UpdateStrategy.MaxUnavailable, int(*cs.Spec.Replicas), false)
updateStrategyMaxUnavailable := intstr.FromInt(0)
if cs.Spec.UpdateStrategy.MaxUnavailable == nil {
updateStrategyMaxUnavailable = *cs.Spec.UpdateStrategy.MaxUnavailable
}
maxUnavailable, err := intstr.GetValueFromIntOrPercent(&updateStrategyMaxUnavailable, int(*cs.Spec.Replicas), false)
if err != nil {
panic(err)
}
@ -193,7 +197,11 @@ func cloneSetMetricFamilies(allowAnnotationsList, allowLabelsList []string) []ge
metric.Gauge,
"",
wrapCloneSetFunc(func(cs *v1alpha1.CloneSet) *metric.Family {
maxSurge, err := intstr.GetValueFromIntOrPercent(cs.Spec.UpdateStrategy.MaxSurge, int(*cs.Spec.Replicas), true)
updateStrategyMaxSurge := intstr.FromInt(0)
if cs.Spec.UpdateStrategy.MaxSurge != nil {
updateStrategyMaxSurge = *cs.Spec.UpdateStrategy.MaxSurge
}
maxSurge, err := intstr.GetValueFromIntOrPercent(&updateStrategyMaxSurge, int(*cs.Spec.Replicas), true)
if err != nil {
panic(err)
}

6
internal/store/daemonset.go
View File

@ -93,7 +93,11 @@ func daemonSetMetricFamilies(allowAnnotationsList, allowLabelsList []string) []g
metric.Gauge,
"",
wrapDaemonSetFunc(func(ds *v1alpha1.DaemonSet) *metric.Family {
maxSurge, err := intstr.GetValueFromIntOrPercent(ds.Spec.UpdateStrategy.RollingUpdate.MaxSurge, int(ds.Status.DesiredNumberScheduled), true)
rollingUpdateMaxSurge := intstr.FromInt(0)
if ds.Spec.UpdateStrategy.RollingUpdate.MaxSurge != nil {
rollingUpdateMaxSurge = *ds.Spec.UpdateStrategy.RollingUpdate.MaxSurge
}
maxSurge, err := intstr.GetValueFromIntOrPercent(&rollingUpdateMaxSurge, int(ds.Status.DesiredNumberScheduled), true)
if err != nil {
panic(err)
}

2
internal/store/sidecarset.go
View File

@ -92,7 +92,7 @@ func sidecarSetMetricFamilies(allowAnnotationsList, allowLabelsList []string) []
}),
),
*generator.NewFamilyGenerator(
"kruise_sidecarset_status_replicas_ready ",
"kruise_sidecarset_status_replicas_ready",
"The number of ready replicas per sidecarset.",
metric.Gauge,
"",