Merge pull request #4556 from mastermaxx03/fix/init-container-clean

frontend: Default to init container if main container not yet running

Author: illume

frontend/src/components/common/Terminal.tsx

@@ -27,6 +27,7 @@ import { Terminal as XTerminal } from '@xterm/xterm';
 import _ from 'lodash';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { getDefaultContainer } from '../../helpers/podContainer';
 import Pod from '../../lib/k8s/pod';
 import { Dialog } from './Dialog';
 
@@ -60,7 +61,7 @@ type execReturn = ReturnType<Pod['exec']>;
 export default function Terminal(props: TerminalProps) {
   const { item, onClose, isAttach, noDialog, ...other } = props;
   const [terminalContainerRef, setTerminalContainerRef] = React.useState<HTMLElement | null>(null);
-  const [container, setContainer] = useState<string | null>(getDefaultContainer());
+  const [container, setContainer] = useState<string | null>(() => getDefaultContainer(item));
   const execOrAttachRef = React.useRef<execReturn | null>(null);
   const fitAddonRef = React.useRef<FitAddon | null>(null);
   const xtermRef = React.useRef<XTerminalConnected | null>(null);
@@ -70,10 +71,6 @@ export default function Terminal(props: TerminalProps) {
   });
   const { t } = useTranslation(['translation', 'glossary']);
 
-  function getDefaultContainer() {
-    return item.spec.containers.length > 0 ? item.spec.containers[0].name : '';
-  }
-
   // @todo: Give the real exec type when we have it.
   function setupTerminal(containerRef: HTMLElement, xterm: XTerminal, fitAddon: FitAddon) {
     if (!containerRef) {
@@ -338,7 +335,7 @@ export default function Terminal(props: TerminalProps) {
   React.useEffect(
     () => {
       if (props.open && container === null) {
-        setContainer(getDefaultContainer());
+        setContainer(getDefaultContainer(item));
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -430,7 +427,7 @@ export default function Terminal(props: TerminalProps) {
           <Select
             labelId="container-name-chooser-label"
             id="container-name-chooser"
-            value={container !== null ? container : getDefaultContainer()}
+            value={container !== null ? container : getDefaultContainer(item)}
             onChange={handleContainerChange}
           >
             {item?.spec?.containers && (

frontend/src/components/pod/Details.tsx

@@ -27,6 +27,7 @@ import _ from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useParams } from 'react-router-dom';
+import { getDefaultContainer } from '../../helpers/podContainer';
 import { KubeContainerStatus } from '../../lib/k8s/cluster';
 import Pod from '../../lib/k8s/pod';
 import { DefaultHeaderAction } from '../../redux/actionButtonsSlice';
@@ -50,6 +51,7 @@ import { useLocalStorageState } from '../globalSearch/useLocalStorageState';
 import { colorizePrettifiedLog } from './jsonHandling';
 import { makePodStatusLabel } from './List';
 import { PodDebugAction } from './PodDebugAction';
+
 const PaddedFormControlLabel = styled(FormControlLabel)(({ theme }) => ({
   margin: 0,
   paddingTop: theme.spacing(2),
@@ -62,7 +64,7 @@ interface PodLogViewerProps extends Omit<LogViewerProps, 'logs'> {
 
 export function PodLogViewer(props: PodLogViewerProps) {
   const { item, onClose, open, ...other } = props;
-  const [container, setContainer] = React.useState(getDefaultContainer());
+  const [container, setContainer] = React.useState(() => getDefaultContainer(item));
   const [showPrevious, setShowPrevious] = React.useState<boolean>(false);
   const [showTimestamps, setShowTimestamps] = useLocalStorageState<boolean>(
     'headlamp.logs.showTimestamps',
@@ -82,10 +84,6 @@ export function PodLogViewer(props: PodLogViewerProps) {
   const xtermRef = React.useRef<XTerminal | null>(null);
   const { t } = useTranslation();
 
-  function getDefaultContainer() {
-    return item.spec.containers.length > 0 ? item.spec.containers[0].name : '';
-  }
-
   const options = { leading: true, trailing: true, maxWait: 1000 };
 
   function setLogsDebounced({
@@ -136,6 +134,12 @@ export function PodLogViewer(props: PodLogViewerProps) {
   }
 
   const debouncedSetState = _.debounce(setLogsDebounced, 500, options);
+  React.useEffect(() => {
+    const next = getDefaultContainer(item);
+    if (next && !container) {
+      setContainer(next);
+    }
+  }, [item?.status]);
 
   React.useEffect(
     () => {

frontend/src/helpers/podContainer.ts

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2025 The Kubernetes Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Pod from '../lib/k8s/pod';
+
+/**
+ * Gets the default container name for a pod based on its current execution state.
+ *
+ * It prioritizes running main containers, then running init containers,
+ * falling back to the first container in the spec if none are running.
+ *
+ * @param item - The pod object to check.
+ * @returns The name of the default container or an empty string if none exist.
+ */
+
+export function getDefaultContainer(item: Pod): string {
+  if (!item) {
+    return '';
+  }
+
+  // Prefer a running main container
+  const runningMain = item.status?.containerStatuses?.find(s => s.state?.running);
+  if (runningMain) {
+    return runningMain.name;
+  }
+
+  // Otherwise use running init container
+  const runningInit = item.status?.initContainerStatuses?.find(s => s.state?.running);
+  if (runningInit) {
+    return runningInit.name;
+  }
+
+  // Fallback to first main container
+  return item.spec?.containers?.[0]?.name ?? '';
+}