Merge pull request #8253 from yalosev/fix/vpa-in-place-metrics

Fix(VPA): updater in-place metrics initialization

Author: k8s-ci-robot

vertical-pod-autoscaler/pkg/updater/logic/updater.go

@@ -212,12 +212,12 @@ func (u *updater) RunOnce(ctx context.Context) {
 	// wrappers for metrics which are computed every loop run
 	controlledPodsCounter := metrics_updater.NewControlledPodsCounter()
 	evictablePodsCounter := metrics_updater.NewEvictablePodsCounter()
-	inPlaceUpdatablePodsCounter := metrics_updater.NewInPlaceUpdtateablePodsCounter()
+	inPlaceUpdatablePodsCounter := metrics_updater.NewInPlaceUpdatablePodsCounter()
 	vpasWithEvictablePodsCounter := metrics_updater.NewVpasWithEvictablePodsCounter()
 	vpasWithEvictedPodsCounter := metrics_updater.NewVpasWithEvictedPodsCounter()
 
-	vpasWithInPlaceUpdatablePodsCounter := metrics_updater.NewVpasWithInPlaceUpdtateablePodsCounter()
-	vpasWithInPlaceUpdatedPodsCounter := metrics_updater.NewVpasWithInPlaceUpdtatedPodsCounter()
+	vpasWithInPlaceUpdatablePodsCounter := metrics_updater.NewVpasWithInPlaceUpdatablePodsCounter()
+	vpasWithInPlaceUpdatedPodsCounter := metrics_updater.NewVpasWithInPlaceUpdatedPodsCounter()
 
 	// using defer to protect against 'return' after evictionRateLimiter.Wait
 	defer controlledPodsCounter.Observe()

vertical-pod-autoscaler/pkg/utils/metrics/updater/updater.go

@@ -164,19 +164,19 @@ func AddEvictedPod(vpaSize int) {
 	evictedCount.WithLabelValues(strconv.Itoa(log2)).Inc()
 }
 
-// NewInPlaceUpdtateablePodsCounter returns a wrapper for counting Pods which are matching in-place update criteria
-func NewInPlaceUpdtateablePodsCounter() *SizeBasedGauge {
-	return newSizeBasedGauge(evictableCount)
+// NewInPlaceUpdatablePodsCounter returns a wrapper for counting Pods which are matching in-place update criteria
+func NewInPlaceUpdatablePodsCounter() *SizeBasedGauge {
+	return newSizeBasedGauge(inPlaceUpdatableCount)
 }
 
-// NewVpasWithInPlaceUpdtateablePodsCounter returns a wrapper for counting VPA objects with Pods matching in-place update criteria
-func NewVpasWithInPlaceUpdtateablePodsCounter() *SizeBasedGauge {
-	return newSizeBasedGauge(vpasWithEvictablePodsCount)
+// NewVpasWithInPlaceUpdatablePodsCounter returns a wrapper for counting VPA objects with Pods matching in-place update criteria
+func NewVpasWithInPlaceUpdatablePodsCounter() *SizeBasedGauge {
+	return newSizeBasedGauge(vpasWithInPlaceUpdatablePodsCount)
 }
 
-// NewVpasWithInPlaceUpdtatedPodsCounter returns a wrapper for counting VPA objects with evicted Pods
-func NewVpasWithInPlaceUpdtatedPodsCounter() *SizeBasedGauge {
-	return newSizeBasedGauge(vpasWithEvictedPodsCount)
+// NewVpasWithInPlaceUpdatedPodsCounter returns a wrapper for counting VPA objects with in-place updated Pods
+func NewVpasWithInPlaceUpdatedPodsCounter() *SizeBasedGauge {
+	return newSizeBasedGauge(vpasWithInPlaceUpdatedPodsCount)
 }
 
 // AddInPlaceUpdatedPod increases the counter of pods updated in place by Updater, by given VPA size