K8SPSMDB-1398 Suppress storage discrepancy error if external volume autoscaling is enabled (#1897)

terryyanko · hors · web-flow · commit dab3ba19be58 · 2025-06-04T17:58:25.000+03:00
* bypass

* wip

* return if true

* ignore pvcs reconciliation altogether

* rename to enableExternalVolumeAutoscaler

* generate manifests

* use main

* add example option to cr.yaml

---------

Co-authored-by: Viacheslav Sarzhan &lt;slava.sarzhan@percona.com&gt;
diff --git a/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml b/config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml
@@ -456,6 +456,8 @@ spec:
                 type: string
               crVersion:
                 type: string
+              enableExternalVolumeAutoscaling:
+                type: boolean
               enableVolumeExpansion:
                 type: boolean
               ignoreAnnotations:
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -1184,6 +1184,8 @@ spec:
                 type: string
               crVersion:
                 type: string
+              enableExternalVolumeAutoscaling:
+                type: boolean
               enableVolumeExpansion:
                 type: boolean
               ignoreAnnotations:
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -13,6 +13,7 @@ spec:
 #  pause: true
 #  unmanaged: false
 #  enableVolumeExpansion: false
+#  enableExternalVolumeAutoscaling: false
   crVersion: 1.21.0
   image: perconalab/percona-server-mongodb-operator:main-mongod8.0
   imagePullPolicy: Always
diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -1184,6 +1184,8 @@ spec:
                 type: string
               crVersion:
                 type: string
+              enableExternalVolumeAutoscaling:
+                type: boolean
               enableVolumeExpansion:
                 type: boolean
               ignoreAnnotations:
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -1184,6 +1184,8 @@ spec:
                 type: string
               crVersion:
                 type: string
+              enableExternalVolumeAutoscaling:
+                type: boolean
               enableVolumeExpansion:
                 type: boolean
               ignoreAnnotations:
diff --git a/e2e-tests/version-service/conf/crd.yaml b/e2e-tests/version-service/conf/crd.yaml
@@ -1184,6 +1184,8 @@ spec:
                 type: string
               crVersion:
                 type: string
+              enableExternalVolumeAutoscaling:
+                type: boolean
               enableVolumeExpansion:
                 type: boolean
               ignoreAnnotations:
diff --git a/pkg/apis/psmdb/v1/psmdb_types.go b/pkg/apis/psmdb/v1/psmdb_types.go
@@ -69,35 +69,36 @@ const (
 
 // PerconaServerMongoDBSpec defines the desired state of PerconaServerMongoDB
 type PerconaServerMongoDBSpec struct {
-	Pause                        bool                                 `json:"pause,omitempty"`
-	Unmanaged                    bool                                 `json:"unmanaged,omitempty"`
-	CRVersion                    string                               `json:"crVersion,omitempty"`
-	Platform                     *version.Platform                    `json:"platform,omitempty"`
-	Image                        string                               `json:"image"`
-	ImagePullSecrets             []corev1.LocalObjectReference        `json:"imagePullSecrets,omitempty"`
-	UnsafeConf                   bool                                 `json:"allowUnsafeConfigurations,omitempty"`
-	Unsafe                       UnsafeFlags                          `json:"unsafeFlags,omitempty"`
-	IgnoreLabels                 []string                             `json:"ignoreLabels,omitempty"`
-	IgnoreAnnotations            []string                             `json:"ignoreAnnotations,omitempty"`
-	Replsets                     []*ReplsetSpec                       `json:"replsets,omitempty"`
-	Secrets                      *SecretsSpec                         `json:"secrets,omitempty"`
-	Backup                       BackupSpec                           `json:"backup,omitempty"`
-	ImagePullPolicy              corev1.PullPolicy                    `json:"imagePullPolicy,omitempty"`
-	PMM                          PMMSpec                              `json:"pmm,omitempty"`
-	UpdateStrategy               appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"`
-	UpgradeOptions               UpgradeOptions                       `json:"upgradeOptions,omitempty"`
-	SchedulerName                string                               `json:"schedulerName,omitempty"`
-	ClusterServiceDNSSuffix      string                               `json:"clusterServiceDNSSuffix,omitempty"`
-	ClusterServiceDNSMode        DNSMode                              `json:"clusterServiceDNSMode,omitempty"`
-	Sharding                     Sharding                             `json:"sharding,omitempty"`
-	InitImage                    string                               `json:"initImage,omitempty"`
-	InitContainerSecurityContext *corev1.SecurityContext              `json:"initContainerSecurityContext,omitempty"`
-	MultiCluster                 MultiCluster                         `json:"multiCluster,omitempty"`
-	TLS                          *TLSSpec                             `json:"tls,omitempty"`
-	Users                        []User                               `json:"users,omitempty"`
-	Roles                        []Role                               `json:"roles,omitempty"`
-	VolumeExpansionEnabled       bool                                 `json:"enableVolumeExpansion,omitempty"`
-	LogCollector                 *LogCollectorSpec                    `json:"logcollector,omitempty"`
+	Pause                           bool                                 `json:"pause,omitempty"`
+	Unmanaged                       bool                                 `json:"unmanaged,omitempty"`
+	CRVersion                       string                               `json:"crVersion,omitempty"`
+	Platform                        *version.Platform                    `json:"platform,omitempty"`
+	Image                           string                               `json:"image"`
+	ImagePullSecrets                []corev1.LocalObjectReference        `json:"imagePullSecrets,omitempty"`
+	UnsafeConf                      bool                                 `json:"allowUnsafeConfigurations,omitempty"`
+	Unsafe                          UnsafeFlags                          `json:"unsafeFlags,omitempty"`
+	IgnoreLabels                    []string                             `json:"ignoreLabels,omitempty"`
+	IgnoreAnnotations               []string                             `json:"ignoreAnnotations,omitempty"`
+	Replsets                        []*ReplsetSpec                       `json:"replsets,omitempty"`
+	Secrets                         *SecretsSpec                         `json:"secrets,omitempty"`
+	Backup                          BackupSpec                           `json:"backup,omitempty"`
+	ImagePullPolicy                 corev1.PullPolicy                    `json:"imagePullPolicy,omitempty"`
+	PMM                             PMMSpec                              `json:"pmm,omitempty"`
+	UpdateStrategy                  appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"`
+	UpgradeOptions                  UpgradeOptions                       `json:"upgradeOptions,omitempty"`
+	SchedulerName                   string                               `json:"schedulerName,omitempty"`
+	ClusterServiceDNSSuffix         string                               `json:"clusterServiceDNSSuffix,omitempty"`
+	ClusterServiceDNSMode           DNSMode                              `json:"clusterServiceDNSMode,omitempty"`
+	Sharding                        Sharding                             `json:"sharding,omitempty"`
+	InitImage                       string                               `json:"initImage,omitempty"`
+	InitContainerSecurityContext    *corev1.SecurityContext              `json:"initContainerSecurityContext,omitempty"`
+	MultiCluster                    MultiCluster                         `json:"multiCluster,omitempty"`
+	TLS                             *TLSSpec                             `json:"tls,omitempty"`
+	Users                           []User                               `json:"users,omitempty"`
+	Roles                           []Role                               `json:"roles,omitempty"`
+	VolumeExpansionEnabled          bool                                 `json:"enableVolumeExpansion,omitempty"`
+	LogCollector                    *LogCollectorSpec                    `json:"logcollector,omitempty"`
+	EnableExternalVolumeAutoscaling bool                                 `json:"enableExternalVolumeAutoscaling,omitempty"`
 }
 
 type UserRole struct {
diff --git a/pkg/controller/perconaservermongodb/volumes.go b/pkg/controller/perconaservermongodb/volumes.go
@@ -48,6 +48,10 @@ func validatePVCName(pvc corev1.PersistentVolumeClaim, sts *appsv1.StatefulSet)
 }
 
 func (r *ReconcilePerconaServerMongoDB) resizeVolumesIfNeeded(ctx context.Context, cr *psmdbv1.PerconaServerMongoDB, sts *appsv1.StatefulSet, ls map[string]string, volumeSpec *api.VolumeSpec) error {
+	if cr.Spec.EnableExternalVolumeAutoscaling {
+		return nil
+	}
+
 	log := logf.FromContext(ctx).WithName("PVCResize").WithValues("sts", sts.Name)
 
 	pvcSpec := volumeSpec.PersistentVolumeClaim

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ func validatePVCName(pvc corev1.PersistentVolumeClaim, sts *appsv1.StatefulSet)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func (r ReconcilePerconaServerMongoDB) resizeVolumesIfNeeded(ctx context.Context, cr psmdbv1.PerconaServerMongoDB, sts appsv1.StatefulSet, ls map[string]string, volumeSpec api.VolumeSpec) error {`
	`51`	`+ if cr.Spec.EnableExternalVolumeAutoscaling {`
	`52`	`+ return nil`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`log := logf.FromContext(ctx).WithName("PVCResize").WithValues("sts", sts.Name)`
`52`	`56`
`53`	`57`	`pvcSpec := volumeSpec.PersistentVolumeClaim`