diff --git a/internal/store/cloneset.go b/internal/store/cloneset.go index dfe692c..08204e4 100644 --- a/internal/store/cloneset.go +++ b/internal/store/cloneset.go @@ -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) } diff --git a/internal/store/daemonset.go b/internal/store/daemonset.go index e48208b..673725d 100644 --- a/internal/store/daemonset.go +++ b/internal/store/daemonset.go @@ -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) } diff --git a/internal/store/sidecarset.go b/internal/store/sidecarset.go index 7d8a58d..f101394 100644 --- a/internal/store/sidecarset.go +++ b/internal/store/sidecarset.go @@ -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, "",