@@ -25,6 +25,7 @@ import (
 
 	"github.com/cloudnative-pg/machinery/pkg/log"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
@@ -108,7 +109,7 @@ func reconcileVolumeAttributeClass(
 	}
 
 	expectedVolumeAttributesClassName := storageConfiguration.PersistentVolumeClaimTemplate.VolumeAttributesClassName
-	if expectedVolumeAttributesClassName == pvc.Spec.VolumeAttributesClassName {
+	if ptr.Equal(expectedVolumeAttributesClassName, pvc.Spec.VolumeAttributesClassName) {
 		return nil
 	}
 
 
@@ -31,6 +31,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 
 	apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
 	"github.com/cloudnative-pg/cloudnative-pg/internal/configuration"
@@ -599,6 +600,7 @@ var _ = Describe("Reconcile Volume Attribute Class", func() {
 		pvc         corev1.PersistentVolumeClaim
 		cli         client.Client
 		ctx         context.Context
+		patchCount  int
 	)
 
 	BeforeEach(func() {
@@ -609,9 +611,18 @@ var _ = Describe("Reconcile Volume Attribute Class", func() {
 			},
 		}
 		pvc = makePVC(clusterName, "1", "1", NewPgDataCalculator(), false)
+		patchCount = 0
 		cli = fake.NewClientBuilder().
 			WithScheme(scheme.BuildWithAllKnownScheme()).
 			WithObjects(cluster, &pvc).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Patch: func(ctx context.Context, c client.WithWatch, obj client.Object,
+					patch client.Patch, opts ...client.PatchOption,
+				) error {
+					patchCount++
+					return c.Patch(ctx, obj, patch, opts...)
+				},
+			}).
 			Build()
 	})
 
@@ -633,13 +644,14 @@ var _ = Describe("Reconcile Volume Attribute Class", func() {
 		storage := &apiv1.StorageConfiguration{
 			Size: "1Gi",
 			PersistentVolumeClaimTemplate: &corev1.PersistentVolumeClaimSpec{
-				VolumeAttributesClassName: &className,
+				VolumeAttributesClassName: ptr.To(className),
 			},
 		}
 
 		err := reconcileVolumeAttributeClass(ctx, cli, storage, &pvc)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(*pvc.Spec.VolumeAttributesClassName).To(Equal(className))
+		Expect(pvc.Spec.VolumeAttributesClassName).To(HaveValue(Equal(className)))
+		Expect(patchCount).To(BeZero(), "no patch should be issued for an already-correct PVC")
 	})
 
 	It("updates VolumeAttributesClassName when it differs from the expected value", func() {
@@ -657,6 +669,7 @@ var _ = Describe("Reconcile Volume Attribute Class", func() {
 		err := reconcileVolumeAttributeClass(ctx, cli, storage, &pvc)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(*pvc.Spec.VolumeAttributesClassName).To(Equal(expectedClassName))
+		Expect(patchCount).To(Equal(1))
 	})
 
 	It("sets VolumeAttributesClassName to nil when template specifies nil", func() {
@@ -673,5 +686,6 @@ var _ = Describe("Reconcile Volume Attribute Class", func() {
 		err := reconcileVolumeAttributeClass(ctx, cli, storage, &pvc)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(pvc.Spec.VolumeAttributesClassName).To(BeNil())
+		Expect(patchCount).To(Equal(1))
 	})
 })
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"github.com/cloudnative-pg/machinery/pkg/log"`
`27`	`27`	`corev1 "k8s.io/api/core/v1"`
	`28`	`+ "k8s.io/utils/ptr"`
`28`	`29`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`29`	`30`
`30`	`31`	`apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"`
`@@ -108,7 +109,7 @@ func reconcileVolumeAttributeClass(`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`expectedVolumeAttributesClassName := storageConfiguration.PersistentVolumeClaimTemplate.VolumeAttributesClassName`
`111`		`- if expectedVolumeAttributesClassName == pvc.Spec.VolumeAttributesClassName {`
	`112`	`+ if ptr.Equal(expectedVolumeAttributesClassName, pvc.Spec.VolumeAttributesClassName) {`
`112`	`113`	`return nil`
`113`	`114`	`}`
`114`	`115`