Merge pull request #1494 from devtron-labs/ephemeral-container-non-root-support

fix: refactoring ephemeral containers extraction logic

Author: gireesh-naidu

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx

@@ -100,12 +100,6 @@ function NodeDetailComponent({
         }
     }, [loadingResources, params.node, params.namespace])
 
-    const isExternalEphemeralContainer = (cmds: string[], name: string): boolean => {
-        const matchingCmd = `sh ${name}-devtron.sh`
-        const internal = cmds?.find((cmd) => cmd.includes(matchingCmd))
-        return !internal
-    }
-
     const getContainersFromManifest = async () => {
         try {
             const { result } = await getManifestResource(
@@ -137,30 +131,19 @@ function NodeDetailComponent({
                     )
                 }
 
-                if (Array.isArray(result.manifest.spec.ephemeralContainers)) {
-                    const ephemeralContainerStatusMap = new Map<string, string[]>()
-                    result.manifest.spec.ephemeralContainers.forEach((con) => {
-                        ephemeralContainerStatusMap.set(con.name, con.command as string[])
-                    })
-                    let ephemeralContainers = []
-                    result.manifest.status.ephemeralContainerStatuses?.forEach((_container) => {
-                        //con.state contains three states running,waiting and terminated
-                        // at any point of time only one state will be there
-                        if (_container.state.running) {
-                            ephemeralContainers.push({
-                                name: _container.name,
-                                isInitContainer: false,
-                                isEphemeralContainer: true,
-                                isExternal: isExternalEphemeralContainer(
-                                    ephemeralContainerStatusMap.get(_container.name),
-                                    _container.name,
-                                ),
-                            })
-                        }
-                    })
-                    _resourceContainers.push(...ephemeralContainers)
-                }
             }
+
+            if (result?.ephemeralContainers) {
+                _resourceContainers.push(
+                    ...result.ephemeralContainers.map((_container) => ({
+                        name: _container.name,
+                        isInitContainer: false,
+                        isEphemeralContainer: true,
+                        isExternal: _container.isExternal,
+                    })),
+                )
+            }
+
             setResourceContainers(_resourceContainers)
             if (isResourceBrowserView) {
                 setContainers(_resourceContainers ?? [])