Avoid unnecessary patching when resources are being deleted (#9763)

Signed-off-by: Jakub Scholz <www@scholzj.com>
strimzi · Mar 4, 2024 · 0c3deb1 · 0c3deb1
1 parent 1d5a388
commit 0c3deb1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/...mon/src/main/java/io/strimzi/operator/common/operator/resource/NetworkPolicyOperator.java b/...mon/src/main/java/io/strimzi/operator/common/operator/resource/NetworkPolicyOperator.java
@@ -20,6 +20,8 @@ public class NetworkPolicyOperator extends AbstractNamespacedResourceOperator<Ku
     private static final Pattern IGNORABLE_PATHS = Pattern.compile(
             "^(/metadata/managedFields" +
                     "|/metadata/creationTimestamp" +
+                    "|/metadata/deletionTimestamp" +
+                    "|/metadata/deletionGracePeriodSeconds" +
                     "|/metadata/resourceVersion" +
                     "|/metadata/generation" +
                     "|/metadata/uid" +

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
@@ -28,6 +28,8 @@ public class PvcOperator extends AbstractNamespacedResourceOperator<KubernetesCl
                     "|/metadata/annotations/volume.kubernetes.io~1.*" +
                     "|/metadata/finalizers" +
                     "|/metadata/creationTimestamp" +
+                    "|/metadata/deletionTimestamp" +
+                    "|/metadata/deletionGracePeriodSeconds" +
                     "|/metadata/resourceVersion" +
                     "|/metadata/generation" +
                     "|/metadata/uid" +

diff --git a/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/ResourceDiff.java b/operator-common/src/main/java/io/strimzi/operator/common/operator/resource/ResourceDiff.java
@@ -27,6 +27,8 @@ public class ResourceDiff<T extends HasMetadata> extends AbstractJsonDiff {
     public static final Pattern DEFAULT_IGNORABLE_PATHS = Pattern.compile(
             "^(/metadata/managedFields" +
                     "|/metadata/creationTimestamp" +
+                    "|/metadata/deletionTimestamp" +
+                    "|/metadata/deletionGracePeriodSeconds" +
                     "|/metadata/resourceVersion" +
                     "|/metadata/generation" +
                     "|/metadata/uid" +

diff --git a/...or-common/src/main/java/io/strimzi/operator/common/operator/resource/ServiceOperator.java b/...or-common/src/main/java/io/strimzi/operator/common/operator/resource/ServiceOperator.java
@@ -31,6 +31,8 @@ public class ServiceOperator extends AbstractNamespacedResourceOperator<Kubernet
     private static final Pattern IGNORABLE_PATHS = Pattern.compile(
             "^(/metadata/managedFields" +
                     "|/metadata/creationTimestamp" +
+                    "|/metadata/deletionTimestamp" +
+                    "|/metadata/deletionGracePeriodSeconds" +
                     "|/metadata/resourceVersion" +
                     "|/metadata/generation" +
                     "|/metadata/uid" +