From 586e08b59ded53d9c18761ef9e826d3d18e1a4aa Mon Sep 17 00:00:00 2001
From: Jakub Scholz <www@scholzj.com>
Date: Thu, 15 Jun 2023 12:12:02 +0200
Subject: [PATCH] Improved ignored annotations in PvcOperator - Closes #8667

Signed-off-by: Jakub Scholz <www@scholzj.com>
---
 .../common/operator/resource/PvcOperator.java |  4 ++-
 .../operator/resource/PvcOperatorTest.java    | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/PvcOperator.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/PvcOperator.java
index 872d2c135c8..254d1be1bcb 100644
--- a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/PvcOperator.java
+++ b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/PvcOperator.java
@@ -23,7 +23,9 @@ public class PvcOperator extends AbstractNamespacedResourceOperator<KubernetesCl
     private static final ReconciliationLogger LOGGER = ReconciliationLogger.create(PvcOperator.class);
     private static final Pattern IGNORABLE_PATHS = Pattern.compile(
             "^(/metadata/managedFields" +
-                    "|/metadata/annotations/pv.kubernetes.io~1bind-completed" +
+                    "|/metadata/annotations/pv.kubernetes.io~1.*" +
+                    "|/metadata/annotations/volume.beta.kubernetes.io~1.*" +
+                    "|/metadata/annotations/volume.kubernetes.io~1.*" +
                     "|/metadata/finalizers" +
                     "|/metadata/creationTimestamp" +
                     "|/metadata/resourceVersion" +
diff --git a/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/PvcOperatorTest.java b/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/PvcOperatorTest.java
index f5576f00bef..2744b6d34a5 100644
--- a/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/PvcOperatorTest.java
+++ b/operator-common/src/test/java/io/strimzi/operator/common/operator/resource/PvcOperatorTest.java
@@ -12,10 +12,12 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.strimzi.operator.common.Reconciliation;
 import io.vertx.core.Vertx;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
+import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -103,4 +105,34 @@ public void testRevertingImmutableFields()   {
         assertThat(current.getSpec().getSelector(), is(desired.getSpec().getSelector()));
         assertThat(current.getSpec().getVolumeName(), is(desired.getSpec().getVolumeName()));
     }
+
+    @Test
+    public void testIgnoredAnnotationsInDiff()   {
+        PersistentVolumeClaim pvcWithDefaultAnnos = new PersistentVolumeClaimBuilder(resource("my-pvc"))
+                .editMetadata()
+                    .withAnnotations(Map.of("strimzi.io/delete-claim", "false"))
+                .endMetadata()
+                .build();
+        PersistentVolumeClaim pvcWithOtherAnnos = new PersistentVolumeClaimBuilder(pvcWithDefaultAnnos)
+                .editMetadata()
+                    .withAnnotations(Map.of("strimzi.io/delete-claim", "false",
+                            "pv.kubernetes.io/bound-by-controller", "my-controller",
+                            "some.annotation.io/key", "value"))
+                .endMetadata()
+                .build();
+        PersistentVolumeClaim pvcWithIgnoredAnnos = new PersistentVolumeClaimBuilder(pvcWithDefaultAnnos)
+                .editMetadata()
+                    .withAnnotations(Map.of("strimzi.io/delete-claim", "false",
+                            "pv.kubernetes.io/bound-by-controller", "my-controller",
+                            "volume.beta.kubernetes.io/storage-provisioner", "my-provisioner",
+                            "volume.kubernetes.io/storage-resizer", "my-resizer"))
+                .endMetadata()
+                .build();
+
+        PvcOperator op = createResourceOperations(vertx, mock(KubernetesClient.class));
+
+        assertThat(op.diff(Reconciliation.DUMMY_RECONCILIATION, "my-pvc", pvcWithDefaultAnnos, pvcWithDefaultAnnos).isEmpty(), is(true));
+        assertThat(op.diff(Reconciliation.DUMMY_RECONCILIATION, "my-pvc", pvcWithDefaultAnnos, pvcWithIgnoredAnnos).isEmpty(), is(true));
+        assertThat(op.diff(Reconciliation.DUMMY_RECONCILIATION, "my-pvc", pvcWithDefaultAnnos, pvcWithOtherAnnos).isEmpty(), is(false));
+    }
 }