Merge pull request #323 from devtron-labs/main-sync-develop-26aug

vikramdevtron · web-flow · commit 76f83909c86b · 2025-08-26T13:29:47.000+05:30
sync: Main sync develop 26aug
diff --git a/chart-sync/go.mod b/chart-sync/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 toolchain go1.24.3
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 
 require (
 	github.com/caarlos0/env v3.5.0+incompatible
diff --git a/chart-sync/go.sum b/chart-sync/go.sum
@@ -43,8 +43,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a h1:4IenPb4m+9xPCrJnTSz2IsauB1mdwu7K5ReqDDhEV6Y=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=
diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt
@@ -95,7 +95,7 @@ github.com/containerd/platforms
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/constants
 github.com/devtron-labs/common-lib/fetchAllEnv
@@ -967,4 +967,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 sigs.k8s.io/yaml/goyaml.v3
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/ci-runner/Dockerfile-v27 b/ci-runner/Dockerfile-v27
@@ -24,6 +24,17 @@ RUN apk update && apk add --no-cache --virtual .build-deps && apk add bash && ap
     apk --purge -v del py-pip && \
     rm /var/cache/apk/*
 
+# Ensure /bin/sh reads /etc/shinit for interactive shells
+ENV ENV=/etc/shinit
+
+# Disable core dumps for login shells, bash, and non-login /bin/sh
+RUN set -euo pipefail; \
+    mkdir -p /etc/profile.d; \
+    printf 'ulimit -c 0\n' > /etc/profile.d/disable-core.sh; \
+    printf 'ulimit -c 0\n' > /etc/bash.bashrc; \
+    printf 'ulimit -c 0\n' >> /root/.bashrc; \
+    printf 'ulimit -c 0\n' > /etc/shinit
+
 COPY --from=docker/compose:1.29.2 /usr/local/bin/docker-compose /usr/bin/docker-compose
 
 COPY ./buildpack.json /git-ask-pass.sh /
diff --git a/ci-runner/go.mod b/ci-runner/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 toolchain go1.24.3
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible
diff --git a/ci-runner/go.sum b/ci-runner/go.sum
@@ -114,8 +114,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a h1:4IenPb4m+9xPCrJnTSz2IsauB1mdwu7K5ReqDDhEV6Y=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k=
diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt
@@ -298,7 +298,7 @@ github.com/cncf/xds/go/xds/type/v3
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/blob-storage
 github.com/devtron-labs/common-lib/constants
@@ -1198,4 +1198,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/git-sensor/go.mod b/git-sensor/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 toolchain go1.24.3
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 
 require (
 	github.com/caarlos0/env v3.5.0+incompatible
diff --git a/git-sensor/go.sum b/git-sensor/go.sum
@@ -26,8 +26,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a h1:4IenPb4m+9xPCrJnTSz2IsauB1mdwu7K5ReqDDhEV6Y=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk=
 github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k=
diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt
@@ -66,7 +66,7 @@ github.com/cyphar/filepath-securejoin
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib v0.19.1 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/constants
 github.com/devtron-labs/common-lib/fetchAllEnv
@@ -472,4 +472,4 @@ gopkg.in/yaml.v3
 # mellium.im/sasl v0.3.2
 ## explicit; go 1.20
 mellium.im/sasl
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/image-scanner/go.mod b/image-scanner/go.mod
@@ -70,4 +70,4 @@ require (
 	mellium.im/sasl v0.3.2 // indirect
 )
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/image-scanner/go.sum b/image-scanner/go.sum
@@ -279,8 +279,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a h1:4IenPb4m+9xPCrJnTSz2IsauB1mdwu7K5ReqDDhEV6Y=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt
@@ -74,7 +74,7 @@ github.com/cespare/xxhash/v2
 github.com/coreos/clair/api/v3/clairpb
 github.com/coreos/clair/database
 github.com/coreos/clair/ext/versionfmt
-# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/async
 github.com/devtron-labs/common-lib/constants
@@ -456,4 +456,4 @@ google.golang.org/protobuf/types/known/wrapperspb
 # mellium.im/sasl v0.3.2
 ## explicit; go 1.20
 mellium.im/sasl
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/kubelink/go.mod b/kubelink/go.mod
@@ -168,4 +168,4 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 )
 
-replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/kubelink/go.sum b/kubelink/go.sum
@@ -65,8 +65,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a h1:4IenPb4m+9xPCrJnTSz2IsauB1mdwu7K5ReqDDhEV6Y=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN6UX90KJc4HjyM=
diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt
@@ -125,7 +125,7 @@ github.com/cyphar/filepath-securejoin
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/async
 github.com/devtron-labs/common-lib/constants
@@ -1388,4 +1388,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 sigs.k8s.io/yaml/goyaml.v3
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
diff --git a/kubewatch/go.mod b/kubewatch/go.mod
@@ -238,5 +238,5 @@ require (
 
 replace (
 	github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
 )
diff --git a/kubewatch/go.sum b/kubewatch/go.sum
@@ -129,8 +129,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a h1:4IenPb4m+9xPCrJnTSz2IsauB1mdwu7K5ReqDDhEV6Y=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
diff --git a/kubewatch/pkg/informer/bean/bean.go b/kubewatch/pkg/informer/bean/bean.go
@@ -30,6 +30,7 @@ const (
 
 	ExitCode143Error   = "Error (exit code 143)"
 	NodeNoLongerExists = "PodGC: node no longer exists"
+	NodeForceDeleted   = "Pod was force deleted"
 	UpdateEvent        = "update_event"
 	DeleteEvent        = "delete_event"
 
diff --git a/kubewatch/pkg/informer/cluster/systemExec/helper.go b/kubewatch/pkg/informer/cluster/systemExec/helper.go
@@ -60,7 +60,8 @@ func (impl *InformerImpl) getStopChannel(informerFactory kubeinformers.SharedInf
 func (impl *InformerImpl) checkIfPodDeletedAndUpdateMessage(podName, namespace string,
 	nodeStatus v1alpha1.NodeStatus, config *rest.Config) (v1alpha1.NodeStatus, bool) {
 
-	if (nodeStatus.Phase == v1alpha1.NodeFailed || nodeStatus.Phase == v1alpha1.NodeError) && (nodeStatus.Message == bean.ExitCode143Error || nodeStatus.Message == bean.NodeNoLongerExists) {
+	if (nodeStatus.Phase == v1alpha1.NodeFailed || nodeStatus.Phase == v1alpha1.NodeError) && (nodeStatus.Message == bean.ExitCode143Error || nodeStatus.Message == bean.NodeNoLongerExists ||
+		nodeStatus.Message == bean.NodeForceDeleted) {
 		clusterClient, k8sErr := impl.k8sUtil.GetK8sClientForConfig(config)
 		if k8sErr != nil {
 			return nodeStatus, false
@@ -84,20 +85,40 @@ func (impl *InformerImpl) checkIfPodDeletedAndUpdateMessage(podName, namespace s
 
 func (impl *InformerImpl) assessNodeStatus(eventType string, pod *coreV1.Pod) v1alpha1.NodeStatus {
 	nodeStatus := v1alpha1.NodeStatus{}
-	switch pod.Status.Phase {
-	case coreV1.PodPending:
-		nodeStatus.Phase = v1alpha1.NodePending
-		nodeStatus.Message = getPendingReason(pod)
-	case coreV1.PodSucceeded:
-		nodeStatus.Phase = v1alpha1.NodeSucceeded
-	case coreV1.PodFailed:
-		nodeStatus.Phase, nodeStatus.Message = impl.inferFailedReason(eventType, pod)
-		impl.logger.Infof("Pod %s failed: %s", pod.Name, nodeStatus.Message)
-	case coreV1.PodRunning:
-		nodeStatus.Phase = v1alpha1.NodeRunning
-	default:
-		nodeStatus.Phase = v1alpha1.NodeError
-		nodeStatus.Message = fmt.Sprintf("Unexpected pod phase for %s: %s", pod.ObjectMeta.Name, pod.Status.Phase)
+
+	/*
+		Special handling for delete events with force delete scenarios, Kubernetes does NOT guarantee that the pod status
+		will be updated to "Failed" during force delete. Sometimes the pod phase can be "Running" even after force delete.
+		Force deletion immediately removes the Pod object from the Kubernetes API server without waiting for
+		the kubelet on the node to confirm termination.
+
+		If the application within the pod on the node is still running and hasn't received a termination signal or processed
+		it yet, the container processes might continue to exist on the node even after the Pod object is gone from the API
+		server. This can lead to a state where the pod effectively exists on the node, but Kubernetes no longer tracks it,
+		and it might appear as Running if you were to inspect the node's process list.
+	*/
+	if eventType == bean.DeleteEvent && isPodForceDeletedWhileRunning(pod) {
+		// Force delete detected - treat as failed regardless of current phase
+		impl.logger.Infow("Force delete detected for pod", "podName", pod.Name, "currentPhase", pod.Status.Phase, "deletionGracePeriod", *pod.DeletionGracePeriodSeconds)
+		nodeStatus.Phase = v1alpha1.NodeFailed
+		nodeStatus.Message = bean.NodeForceDeleted
+		return nodeStatus
+	} else {
+		switch pod.Status.Phase {
+		case coreV1.PodPending:
+			nodeStatus.Phase = v1alpha1.NodePending
+			nodeStatus.Message = getPendingReason(pod)
+		case coreV1.PodSucceeded:
+			nodeStatus.Phase = v1alpha1.NodeSucceeded
+		case coreV1.PodFailed:
+			nodeStatus.Phase, nodeStatus.Message = impl.inferFailedReason(eventType, pod)
+			impl.logger.Infof("Pod %s failed: %s", pod.Name, nodeStatus.Message)
+		case coreV1.PodRunning:
+			nodeStatus.Phase = v1alpha1.NodeRunning
+		default:
+			nodeStatus.Phase = v1alpha1.NodeError
+			nodeStatus.Message = fmt.Sprintf("Unexpected pod phase for %s: %s", pod.ObjectMeta.Name, pod.Status.Phase)
+		}
 	}
 
 	// only update Pod IP for daemoned nodes to reduce number of updates
diff --git a/kubewatch/pkg/informer/cluster/systemExec/util.go b/kubewatch/pkg/informer/cluster/systemExec/util.go
@@ -82,6 +82,15 @@ func isResourceNotFoundErr(err error) bool {
 	return false
 }
 
+// isPodForceDeletedWhileRunning checks if a pod was force deleted based on deletion metadata
+func isPodForceDeletedWhileRunning(pod *coreV1.Pod) bool {
+	//For reference all pod phases that exists :- https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
+	if (pod.Status.Phase == coreV1.PodRunning || pod.Status.Phase == coreV1.PodPending) && pod.DeletionTimestamp != nil && pod.DeletionGracePeriodSeconds != nil && *pod.DeletionGracePeriodSeconds == 0 {
+		return true
+	}
+	return false
+}
+
 func getWorkflowStatus(podObj *coreV1.Pod, nodeStatus v1alpha1.NodeStatus, templateName string) *informerBean.CiCdStatus {
 	workflowStatus := &informerBean.CiCdStatus{
 		WorkflowStatus: &v1alpha1.WorkflowStatus{},
diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt
diff --git a/lens/go.mod b/lens/go.mod
diff --git a/lens/go.sum b/lens/go.sum
diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt
