cluster: support HPA for all cluster CRs storage

AndrewChubatiuk · AndrewChubatiuk · commit 63f0cea07eb7 · 2025-12-11T12:00:02.000+02:00
diff --git a/api/operator/v1/vlcluster_types.go b/api/operator/v1/vlcluster_types.go
@@ -526,6 +526,11 @@ type VLStorage struct {
 	// ClaimTemplates allows adding additional VolumeClaimTemplates for StatefulSet
 	ClaimTemplates []corev1.PersistentVolumeClaim `json:"claimTemplates,omitempty"`
 
+	// Configures horizontal pod autoscaling.
+	// Note, downscaling is not supported.
+	// +optional
+	HPA *vmv1beta1.EmbeddedHPA `json:"hpa,omitempty"`
+
 	// StorageDataPath - path to storage data
 	// +optional
 	StorageDataPath string `json:"storageDataPath,omitempty"`
@@ -697,6 +702,9 @@ func (cr *VLCluster) Validate() error {
 		if vls.ServiceSpec != nil && vls.ServiceSpec.Name == name {
 			return fmt.Errorf(".serviceSpec.Name cannot be equal to prefixed name=%q", name)
 		}
+		if vls.HPA != nil && vls.HPA.Behaviour != nil && vls.HPA.Behaviour.ScaleDown != nil {
+			return fmt.Errorf("vlstorage scaledown HPA behavior is not supported")
+		}
 	}
 	if cr.Spec.RequestsLoadBalancer.Enabled {
 		rlb := cr.Spec.RequestsLoadBalancer.Spec
diff --git a/api/operator/v1/vtcluster_types.go b/api/operator/v1/vtcluster_types.go
@@ -441,6 +441,11 @@ type VTStorage struct {
 	// ClaimTemplates allows adding additional VolumeClaimTemplates for StatefulSet
 	ClaimTemplates []corev1.PersistentVolumeClaim `json:"claimTemplates,omitempty"`
 
+	// Configures horizontal pod autoscaling.
+	// Note, downscaling is not supported.
+	// +optional
+	HPA *vmv1beta1.EmbeddedHPA `json:"hpa,omitempty"`
+
 	// StorageDataPath - path to storage data
 	// +optional
 	StorageDataPath string `json:"storageDataPath,omitempty"`
@@ -612,6 +617,9 @@ func (cr *VTCluster) Validate() error {
 		if vts.ServiceSpec != nil && vts.ServiceSpec.Name == name {
 			return fmt.Errorf(".serviceSpec.Name cannot be equal to prefixed name=%q", name)
 		}
+		if vts.HPA != nil && vts.HPA.Behaviour != nil && vts.HPA.Behaviour.ScaleDown != nil {
+			return fmt.Errorf("vtstorage scaledown HPA behavior is not supported")
+		}
 	}
 	if cr.Spec.RequestsLoadBalancer.Enabled {
 		rlb := cr.Spec.RequestsLoadBalancer.Spec
diff --git a/api/operator/v1/zz_generated.deepcopy.go b/api/operator/v1/zz_generated.deepcopy.go
diff --git a/api/operator/v1beta1/vmcluster_types.go b/api/operator/v1beta1/vmcluster_types.go
@@ -445,6 +445,11 @@ type VMStorage struct {
 	// +optional
 	PersistentVolumeClaimRetentionPolicy *appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy `json:"persistentVolumeClaimRetentionPolicy,omitempty"`
 
+	// Configures horizontal pod autoscaling.
+	// Note, downscaling is not supported.
+	// +optional
+	HPA *EmbeddedHPA `json:"hpa,omitempty"`
+
 	// VMInsertPort for VMInsert connections
 	// +optional
 	VMInsertPort string `json:"vmInsertPort,omitempty"`
@@ -670,6 +675,9 @@ func (cr *VMCluster) Validate() error {
 				return fmt.Errorf("vmstorage: %w", err)
 			}
 		}
+		if vms.HPA != nil && vms.HPA.Behaviour != nil && vms.HPA.Behaviour.ScaleDown != nil {
+			return fmt.Errorf("vmstorage scaledown HPA behavior is not supported")
+		}
 	}
 	if cr.Spec.RequestsLoadBalancer.Enabled {
 		rlb := cr.Spec.RequestsLoadBalancer.Spec
diff --git a/api/operator/v1beta1/zz_generated.deepcopy.go b/api/operator/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/overlay/crd.yaml b/config/crd/overlay/crd.yaml
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -15,6 +15,7 @@ aliases:
 
 * FEATURE: [vmagent](https://docs.victoriametrics.com/operator/resources/vmagent/): support `namespace` parameter in `attach_metadata` section for all scrape configurations. See [#1654](https://github.com/VictoriaMetrics/operator/issues/1654).
 * FEATURE: [vlagent](https://docs.victoriametrics.com/operator/resources/vlagent): support logs collection. See [#1501](https://github.com/VictoriaMetrics/operator/issues/1501).
+* FEATURE: [vmoperator](https://docs.victoriametrics.com/operator/): added HPA support for all cluster CR storage. See [#1678](https://github.com/VictoriaMetrics/operator/issues/1678).
 
 ## [v0.66.1](https://github.com/VictoriaMetrics/operator/releases/tag/v0.66.1)
 
diff --git a/docs/api.md b/docs/api.md
@@ -561,6 +561,7 @@ Appears in: [VLClusterSpec](#vlclusterspec)
 | hostAliases<a href="#vlstorage-hostaliases" id="vlstorage-hostaliases">#</a><br/>_[HostAlias](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostalias-v1-core) array_ | _(Optional)_<br/>HostAliases provides mapping for ip and hostname,<br />that would be propagated to pod,<br />cannot be used with HostNetwork. |
 | hostNetwork<a href="#vlstorage-hostnetwork" id="vlstorage-hostnetwork">#</a><br/>_boolean_ | _(Optional)_<br/>HostNetwork controls whether the pod may use the node network namespace |
 | host_aliases<a href="#vlstorage-host_aliases" id="vlstorage-host_aliases">#</a><br/>_[HostAlias](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostalias-v1-core) array_ | _(Optional)_<br/>HostAliasesUnderScore provides mapping for ip and hostname,<br />that would be propagated to pod,<br />cannot be used with HostNetwork.<br />Has Priority over hostAliases field |
+| hpa<a href="#vlstorage-hpa" id="vlstorage-hpa">#</a><br/>_[EmbeddedHPA](#embeddedhpa)_ | _(Optional)_<br/>Configures horizontal pod autoscaling.<br />Note, downscaling is not supported. |
 | image<a href="#vlstorage-image" id="vlstorage-image">#</a><br/>_[Image](#image)_ | _(Optional)_<br/>Image - docker image settings<br />if no specified operator uses default version from operator config |
 | imagePullSecrets<a href="#vlstorage-imagepullsecrets" id="vlstorage-imagepullsecrets">#</a><br/>_[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#localobjectreference-v1-core) array_ | _(Optional)_<br/>ImagePullSecrets An optional list of references to secrets in the same namespace<br />to use for pulling images from registries<br />see https://kubernetes.io/docs/concepts/containers/images/#referring-to-an-imagepullsecrets-on-a-pod |
 | initContainers<a href="#vlstorage-initcontainers" id="vlstorage-initcontainers">#</a><br/>_[Container](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#container-v1-core) array_ | _(Optional)_<br/>InitContainers allows adding initContainers to the pod definition.<br />Any errors during the execution of an initContainer will lead to a restart of the Pod.<br />More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ |
@@ -1094,6 +1095,7 @@ Appears in: [VTClusterSpec](#vtclusterspec)
 | hostAliases<a href="#vtstorage-hostaliases" id="vtstorage-hostaliases">#</a><br/>_[HostAlias](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostalias-v1-core) array_ | _(Optional)_<br/>HostAliases provides mapping for ip and hostname,<br />that would be propagated to pod,<br />cannot be used with HostNetwork. |
 | hostNetwork<a href="#vtstorage-hostnetwork" id="vtstorage-hostnetwork">#</a><br/>_boolean_ | _(Optional)_<br/>HostNetwork controls whether the pod may use the node network namespace |
 | host_aliases<a href="#vtstorage-host_aliases" id="vtstorage-host_aliases">#</a><br/>_[HostAlias](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostalias-v1-core) array_ | _(Optional)_<br/>HostAliasesUnderScore provides mapping for ip and hostname,<br />that would be propagated to pod,<br />cannot be used with HostNetwork.<br />Has Priority over hostAliases field |
+| hpa<a href="#vtstorage-hpa" id="vtstorage-hpa">#</a><br/>_[EmbeddedHPA](#embeddedhpa)_ | _(Optional)_<br/>Configures horizontal pod autoscaling.<br />Note, downscaling is not supported. |
 | image<a href="#vtstorage-image" id="vtstorage-image">#</a><br/>_[Image](#image)_ | _(Optional)_<br/>Image - docker image settings<br />if no specified operator uses default version from operator config |
 | imagePullSecrets<a href="#vtstorage-imagepullsecrets" id="vtstorage-imagepullsecrets">#</a><br/>_[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#localobjectreference-v1-core) array_ | _(Optional)_<br/>ImagePullSecrets An optional list of references to secrets in the same namespace<br />to use for pulling images from registries<br />see https://kubernetes.io/docs/concepts/containers/images/#referring-to-an-imagepullsecrets-on-a-pod |
 | initContainers<a href="#vtstorage-initcontainers" id="vtstorage-initcontainers">#</a><br/>_[Container](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#container-v1-core) array_ | _(Optional)_<br/>InitContainers allows adding initContainers to the pod definition.<br />Any errors during the execution of an initContainer will lead to a restart of the Pod.<br />More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ |
@@ -1718,7 +1720,7 @@ Appears in: [Receiver](#receiver)
 EmbeddedHPA embeds HorizontalPodAutoScaler spec v2.
 https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/horizontal-pod-autoscaler-v2/
 
-Appears in: [VLInsert](#vlinsert), [VLSelect](#vlselect), [VMAuthSpec](#vmauthspec), [VMInsert](#vminsert), [VMSelect](#vmselect), [VTInsert](#vtinsert), [VTSelect](#vtselect)
+Appears in: [VLInsert](#vlinsert), [VLSelect](#vlselect), [VLStorage](#vlstorage), [VMAuthSpec](#vmauthspec), [VMInsert](#vminsert), [VMSelect](#vmselect), [VMStorage](#vmstorage), [VTInsert](#vtinsert), [VTSelect](#vtselect), [VTStorage](#vtstorage)
 
 | Field | Description |
 | --- | --- |
@@ -4826,6 +4828,7 @@ Appears in: [VMClusterSpec](#vmclusterspec)
 | hostAliases<a href="#vmstorage-hostaliases" id="vmstorage-hostaliases">#</a><br/>_[HostAlias](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostalias-v1-core) array_ | _(Optional)_<br/>HostAliases provides mapping for ip and hostname,<br />that would be propagated to pod,<br />cannot be used with HostNetwork. |
 | hostNetwork<a href="#vmstorage-hostnetwork" id="vmstorage-hostnetwork">#</a><br/>_boolean_ | _(Optional)_<br/>HostNetwork controls whether the pod may use the node network namespace |
 | host_aliases<a href="#vmstorage-host_aliases" id="vmstorage-host_aliases">#</a><br/>_[HostAlias](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#hostalias-v1-core) array_ | _(Optional)_<br/>HostAliasesUnderScore provides mapping for ip and hostname,<br />that would be propagated to pod,<br />cannot be used with HostNetwork.<br />Has Priority over hostAliases field |
+| hpa<a href="#vmstorage-hpa" id="vmstorage-hpa">#</a><br/>_[EmbeddedHPA](#embeddedhpa)_ | _(Optional)_<br/>Configures horizontal pod autoscaling.<br />Note, downscaling is not supported. |
 | image<a href="#vmstorage-image" id="vmstorage-image">#</a><br/>_[Image](#image)_ | _(Optional)_<br/>Image - docker image settings<br />if no specified operator uses default version from operator config |
 | imagePullSecrets<a href="#vmstorage-imagepullsecrets" id="vmstorage-imagepullsecrets">#</a><br/>_[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#localobjectreference-v1-core) array_ | _(Optional)_<br/>ImagePullSecrets An optional list of references to secrets in the same namespace<br />to use for pulling images from registries<br />see https://kubernetes.io/docs/concepts/containers/images/#referring-to-an-imagepullsecrets-on-a-pod |
 | initContainers<a href="#vmstorage-initcontainers" id="vmstorage-initcontainers">#</a><br/>_[Container](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#container-v1-core) array_ | _(Optional)_<br/>InitContainers allows adding initContainers to the pod definition.<br />Any errors during the execution of an initContainer will lead to a restart of the Pod.<br />More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ |
diff --git a/internal/controller/operator/factory/finalize/cluster.go b/internal/controller/operator/factory/finalize/cluster.go
@@ -106,6 +106,7 @@ func OnStorageDelete(ctx context.Context, rclient client.Client, cr build.Parent
 	objsToRemove := []client.Object{
 		&appsv1.StatefulSet{ObjectMeta: objMeta},
 		&policyv1.PodDisruptionBudget{ObjectMeta: objMeta},
+		&autoscalingv2.HorizontalPodAutoscaler{ObjectMeta: objMeta},
 		&vmv1beta1.VMServiceScrape{ObjectMeta: objMeta},
 	}
 	owner := cr.AsOwner()
diff --git a/internal/controller/operator/factory/vlcluster/vlcluster.go b/internal/controller/operator/factory/vlcluster/vlcluster.go
@@ -82,6 +82,9 @@ func deleteOrphaned(ctx context.Context, rclient client.Client, cr *vmv1.VLClust
 		if newStorage.PodDisruptionBudget != nil {
 			cc.KeepPDB(commonName)
 		}
+		if newStorage.HPA != nil {
+			cc.KeepHPA(commonName)
+		}
 		if !ptr.Deref(newStorage.DisableSelfServiceScrape, disableSelfScrape) {
 			cc.KeepScrape(commonName)
 		}
diff --git a/internal/controller/operator/factory/vlcluster/vlstorage.go b/internal/controller/operator/factory/vlcluster/vlstorage.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 
 	appsv1 "k8s.io/api/apps/v1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +40,9 @@ func createOrUpdateVLStorage(ctx context.Context, rclient client.Client, cr, pre
 			return err
 		}
 	}
+	if err := createOrUpdateVLStorageHPA(ctx, rclient, cr, prevCR); err != nil {
+		return err
+	}
 	if err := createOrUpdateVLStorageSTS(ctx, rclient, cr, prevCR); err != nil {
 		return err
 	}
@@ -93,6 +97,30 @@ func createOrUpdateVLStorageService(ctx context.Context, rclient client.Client,
 	return newHeadless, nil
 }
 
+func createOrUpdateVLStorageHPA(ctx context.Context, rclient client.Client, cr, prevCR *vmv1.VLCluster) error {
+	hpa := cr.Spec.VLStorage.HPA
+	if hpa == nil {
+		return nil
+	}
+	if hpa.Behaviour != nil && hpa.Behaviour.ScaleDown != nil {
+		return fmt.Errorf("scaleDown is not supported for vlstorage HPA")
+	}
+	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentStorage)
+	targetRef := autoscalingv2.CrossVersionObjectReference{
+		Name:       b.PrefixedName(),
+		Kind:       "StatefulSet",
+		APIVersion: "apps/v1",
+	}
+	defaultHPA := build.HPA(b, targetRef, hpa)
+	var prevHPA *autoscalingv2.HorizontalPodAutoscaler
+	if prevCR != nil && prevCR.Spec.VLStorage.HPA != nil {
+		b = build.NewChildBuilder(prevCR, vmv1beta1.ClusterComponentStorage)
+		prevHPA = build.HPA(b, targetRef, prevCR.Spec.VLStorage.HPA)
+	}
+
+	return reconcile.HPA(ctx, rclient, defaultHPA, prevHPA)
+}
+
 func createOrUpdateVLStorageSTS(ctx context.Context, rclient client.Client, cr, prevCR *vmv1.VLCluster) error {
 	var prevSts *appsv1.StatefulSet
 
diff --git a/internal/controller/operator/factory/vmcluster/vmcluster.go b/internal/controller/operator/factory/vmcluster/vmcluster.go
@@ -74,6 +74,9 @@ func CreateOrUpdate(ctx context.Context, cr *vmv1beta1.VMCluster, rclient client
 		if err != nil {
 			return err
 		}
+		if err := createOrUpdateVMStorageHPA(ctx, rclient, cr, prevCR); err != nil {
+			return err
+		}
 		if !ptr.Deref(cr.Spec.VMStorage.DisableSelfServiceScrape, cfg.DisableSelfServiceScrapeCreation) {
 			err := reconcile.VMServiceScrapeForCRD(ctx, rclient, build.VMServiceScrapeForServiceWithSpec(storageSvc, cr.Spec.VMStorage, "vmbackupmanager"))
 			if err != nil {
@@ -1119,12 +1122,12 @@ func createOrUpdateVMInsertHPA(ctx context.Context, rclient client.Client, cr, p
 	if cr.Spec.VMInsert.HPA == nil {
 		return nil
 	}
+	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentInsert)
 	targetRef := autoscalingv2.CrossVersionObjectReference{
-		Name:       cr.PrefixedName(vmv1beta1.ClusterComponentInsert),
+		Name:       b.PrefixedName(),
 		Kind:       "Deployment",
 		APIVersion: "apps/v1",
 	}
-	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentInsert)
 	newHPA := build.HPA(b, targetRef, cr.Spec.VMInsert.HPA)
 	var prevHPA *autoscalingv2.HorizontalPodAutoscaler
 	if prevCR != nil && prevCR.Spec.VMInsert.HPA != nil {
@@ -1138,13 +1141,12 @@ func createOrUpdateVMSelectHPA(ctx context.Context, rclient client.Client, cr, p
 	if cr.Spec.VMSelect.HPA == nil {
 		return nil
 	}
-	commonName := cr.PrefixedName(vmv1beta1.ClusterComponentSelect)
+	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentSelect)
 	targetRef := autoscalingv2.CrossVersionObjectReference{
-		Name:       commonName,
+		Name:       b.PrefixedName(),
 		Kind:       "StatefulSet",
 		APIVersion: "apps/v1",
 	}
-	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentSelect)
 	defaultHPA := build.HPA(b, targetRef, cr.Spec.VMSelect.HPA)
 	var prevHPA *autoscalingv2.HorizontalPodAutoscaler
 	if prevCR != nil && prevCR.Spec.VMSelect.HPA != nil {
@@ -1155,6 +1157,30 @@ func createOrUpdateVMSelectHPA(ctx context.Context, rclient client.Client, cr, p
 	return reconcile.HPA(ctx, rclient, defaultHPA, prevHPA)
 }
 
+func createOrUpdateVMStorageHPA(ctx context.Context, rclient client.Client, cr, prevCR *vmv1beta1.VMCluster) error {
+	hpa := cr.Spec.VMStorage.HPA
+	if hpa == nil {
+		return nil
+	}
+	if hpa.Behaviour != nil && hpa.Behaviour.ScaleDown != nil {
+		return fmt.Errorf("scaleDown is not supported for vmstorage HPA")
+	}
+	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentStorage)
+	targetRef := autoscalingv2.CrossVersionObjectReference{
+		Name:       b.PrefixedName(),
+		Kind:       "StatefulSet",
+		APIVersion: "apps/v1",
+	}
+	defaultHPA := build.HPA(b, targetRef, hpa)
+	var prevHPA *autoscalingv2.HorizontalPodAutoscaler
+	if prevCR != nil && prevCR.Spec.VMStorage.HPA != nil {
+		b = build.NewChildBuilder(prevCR, vmv1beta1.ClusterComponentStorage)
+		prevHPA = build.HPA(b, targetRef, prevCR.Spec.VMStorage.HPA)
+	}
+
+	return reconcile.HPA(ctx, rclient, defaultHPA, prevHPA)
+}
+
 func deleteOrphaned(ctx context.Context, rclient client.Client, cr *vmv1beta1.VMCluster) error {
 	newStorage := cr.Spec.VMStorage
 	newSelect := cr.Spec.VMSelect
@@ -1174,6 +1200,9 @@ func deleteOrphaned(ctx context.Context, rclient client.Client, cr *vmv1beta1.VM
 		if newStorage.PodDisruptionBudget != nil {
 			cc.KeepPDB(commonName)
 		}
+		if newStorage.HPA != nil {
+			cc.KeepHPA(commonName)
+		}
 		if !ptr.Deref(newStorage.DisableSelfServiceScrape, disableSelfScrape) {
 			cc.KeepScrape(commonName)
 		}
diff --git a/internal/controller/operator/factory/vtcluster/cluster.go b/internal/controller/operator/factory/vtcluster/cluster.go
@@ -82,6 +82,9 @@ func deleteOrphaned(ctx context.Context, rclient client.Client, cr *vmv1.VTClust
 		if newStorage.PodDisruptionBudget != nil {
 			cc.KeepPDB(commonName)
 		}
+		if newStorage.HPA != nil {
+			cc.KeepHPA(commonName)
+		}
 		if !ptr.Deref(newStorage.DisableSelfServiceScrape, disableSelfScrape) {
 			cc.KeepScrape(commonName)
 		}
diff --git a/internal/controller/operator/factory/vtcluster/storage.go b/internal/controller/operator/factory/vtcluster/storage.go
@@ -7,6 +7,7 @@ import (
 	"sort"
 
 	appsv1 "k8s.io/api/apps/v1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -40,6 +41,9 @@ func createOrUpdateVTStorage(ctx context.Context, rclient client.Client, cr, pre
 			return err
 		}
 	}
+	if err := createOrUpdateVTStorageHPA(ctx, rclient, cr, prevCR); err != nil {
+		return err
+	}
 	if err := createOrUpdateVTStorageSTS(ctx, rclient, cr, prevCR); err != nil {
 		return err
 	}
@@ -94,6 +98,30 @@ func createOrUpdateVTStorageService(ctx context.Context, rclient client.Client,
 	return newHeadless, nil
 }
 
+func createOrUpdateVTStorageHPA(ctx context.Context, rclient client.Client, cr, prevCR *vmv1.VTCluster) error {
+	hpa := cr.Spec.Storage.HPA
+	if hpa == nil {
+		return nil
+	}
+	if hpa.Behaviour != nil && hpa.Behaviour.ScaleDown != nil {
+		return fmt.Errorf("scaleDown is not supported for vtstorage HPA")
+	}
+	b := build.NewChildBuilder(cr, vmv1beta1.ClusterComponentStorage)
+	targetRef := autoscalingv2.CrossVersionObjectReference{
+		Name:       b.PrefixedName(),
+		Kind:       "StatefulSet",
+		APIVersion: "apps/v1",
+	}
+	defaultHPA := build.HPA(b, targetRef, hpa)
+	var prevHPA *autoscalingv2.HorizontalPodAutoscaler
+	if prevCR != nil && prevCR.Spec.Storage.HPA != nil {
+		b = build.NewChildBuilder(prevCR, vmv1beta1.ClusterComponentStorage)
+		prevHPA = build.HPA(b, targetRef, prevCR.Spec.Storage.HPA)
+	}
+
+	return reconcile.HPA(ctx, rclient, defaultHPA, prevHPA)
+}
+
 func createOrUpdateVTStorageSTS(ctx context.Context, rclient client.Client, cr, prevCR *vmv1.VTCluster) error {
 	var prevSts *appsv1.StatefulSet
 

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ func OnStorageDelete(ctx context.Context, rclient client.Client, cr build.Parent`
`106`	`106`	`objsToRemove := []client.Object{`
`107`	`107`	`&appsv1.StatefulSet{ObjectMeta: objMeta},`
`108`	`108`	`&policyv1.PodDisruptionBudget{ObjectMeta: objMeta},`
	`109`	`+ &autoscalingv2.HorizontalPodAutoscaler{ObjectMeta: objMeta},`
`109`	`110`	`&vmv1beta1.VMServiceScrape{ObjectMeta: objMeta},`
`110`	`111`	`}`
`111`	`112`	`owner := cr.AsOwner()`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ func deleteOrphaned(ctx context.Context, rclient client.Client, cr *vmv1.VLClust`
`82`	`82`	`if newStorage.PodDisruptionBudget != nil {`
`83`	`83`	`cc.KeepPDB(commonName)`
`84`	`84`	`}`
	`85`	`+ if newStorage.HPA != nil {`
	`86`	`+ cc.KeepHPA(commonName)`
	`87`	`+ }`
`85`	`88`	`if !ptr.Deref(newStorage.DisableSelfServiceScrape, disableSelfScrape) {`
`86`	`89`	`cc.KeepScrape(commonName)`
`87`	`90`	`}`