From 25bc2dc1ae8eed37f41335bd3e1b08efc1e4540a Mon Sep 17 00:00:00 2001
From: shudeshp <shudeshp@redhat.com>
Date: Fri, 8 Nov 2024 10:09:44 -0500
Subject: [PATCH] resolved conflicts

---
 .../components/clairpgupgrade/base/clair-pg-old.deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml b/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml
index 736cdd680..050f7b371 100644
--- a/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml
+++ b/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml
@@ -57,7 +57,7 @@ spec:
             requests:
               cpu: 500m
               memory: 2Gi
-                 lifecycle:
+          lifecycle:
             postStart:
               exec:
                 command: ["/bin/sh", "-c", "