From d3be8ba3e6e9cfaa674bb0b571df7e71be39f7bf Mon Sep 17 00:00:00 2001
From: Swapnil <shendeswapnil.6@gmail.com>
Date: Tue, 12 May 2026 21:19:18 +0530
Subject: [PATCH 1/4] RFE-3935: Add non-scalable image warning when scaling
 workloads

Warn users when scaling a workload beyond one replica if its container
image has the io.openshift.non-scalable=true label. The warning appears
as an inline alert in the Edit Pod count modal and as a tooltip on the
PodRing scale-up button.

Adds a useNonScalableImageCheck hook that resolves ImageStreamTag
references from Deployment trigger annotations or DeploymentConfig
ImageChange triggers, fetches the IST, and inspects
image.dockerImageMetadata.Config.Labels for the non-scalable label.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../locales/en/console-shared.json            |   3 +-
 .../src/components/pod/PodRing.tsx            |  40 +++--
 .../useNonScalableImageCheck.spec.ts          | 146 ++++++++++++++++++
 .../src/hooks/useNonScalableImageCheck.ts     | 105 +++++++++++++
 .../__tests__/configure-count-modal.spec.tsx  | 107 +++++++++++++
 .../modals/configure-count-modal.tsx          |  25 ++-
 frontend/public/locales/en/public.json        |   2 +
 7 files changed, 416 insertions(+), 12 deletions(-)
 create mode 100644 frontend/packages/console-shared/src/hooks/__tests__/useNonScalableImageCheck.spec.ts
 create mode 100644 frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts
 create mode 100644 frontend/public/components/modals/__tests__/configure-count-modal.spec.tsx

diff --git a/frontend/packages/console-shared/locales/en/console-shared.json b/frontend/packages/console-shared/locales/en/console-shared.json
index 01ed4c5bd31..266bcf1870e 100644
--- a/frontend/packages/console-shared/locales/en/console-shared.json
+++ b/frontend/packages/console-shared/locales/en/console-shared.json
@@ -231,6 +231,7 @@
   "Project": "Project",
   "Namespace": "Namespace",
   "Enable Autoscale": "Enable Autoscale",
+  "This image is not intended to run with more than one replica. Scaling up may cause unexpected behavior.": "This image is not intended to run with more than one replica. Scaling up may cause unexpected behavior.",
   "Increase the Pod count": "Increase the Pod count",
   "Decrease the Pod count": "Decrease the Pod count",
   "No Pods found for this resource.": "No Pods found for this resource.",
@@ -320,4 +321,4 @@
   "Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.": "Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.",
   "Cannot be longer than {{characterCount}} characters.": "Cannot be longer than {{characterCount}} characters.",
   "Required": "Required"
-}
\ No newline at end of file
+}
diff --git a/frontend/packages/console-shared/src/components/pod/PodRing.tsx b/frontend/packages/console-shared/src/components/pod/PodRing.tsx
index 458c10b58b0..73da73059ac 100644
--- a/frontend/packages/console-shared/src/components/pod/PodRing.tsx
+++ b/frontend/packages/console-shared/src/components/pod/PodRing.tsx
@@ -1,12 +1,13 @@
 import type { FC } from 'react';
 import { useState, useEffect } from 'react';
-import { Button, Split, SplitItem, Bullseye } from '@patternfly/react-core';
+import { Button, Split, SplitItem, Bullseye, Tooltip } from '@patternfly/react-core';
 import { AngleDownIcon, AngleUpIcon, AutomationIcon } from '@patternfly/react-icons';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import type { ImpersonateKind } from '@console/dynamic-plugin-sdk';
 import type { K8sResourceKind, K8sKind } from '@console/internal/module/k8s';
 import { k8sPatch } from '@console/internal/module/k8s';
+import { useNonScalableImageCheck } from '../../hooks/useNonScalableImageCheck';
 import { useRelatedHPA } from '../../hooks/useRelatedHPA';
 import type { ExtPodKind } from '../../types';
 import { usePodRingLabel, usePodScalingAccessStatus } from '../../utils/pod-ring-utils';
@@ -82,6 +83,7 @@ const PodRing: FC<PodRingProps> = ({
   } = obj;
   const [hpa] = useRelatedHPA(apiVersion, kind, name, namespace);
   const hpaControlledScaling = !!hpa;
+  const { isNonScalable } = useNonScalableImageCheck(obj);
 
   const isScalingAllowed = isAccessScalingAllowed && !hpaControlledScaling;
 
@@ -126,15 +128,33 @@ const PodRing: FC<PodRingProps> = ({
         <SplitItem>
           <Bullseye>
             <div>
-              <Button
-                icon={<AngleUpIcon style={{ fontSize: '20' }} />}
-                type="button"
-                variant="plain"
-                aria-label={t('console-shared~Increase the Pod count')}
-                title={t('console-shared~Increase the Pod count')}
-                onClick={() => handleClick(1)}
-                isBlock
-              />
+              {isNonScalable && clickCount >= 1 ? (
+                <Tooltip
+                  content={t(
+                    'console-shared~This image is not intended to run with more than one replica. Scaling up may cause unexpected behavior.',
+                  )}
+                >
+                  <Button
+                    icon={<AngleUpIcon style={{ fontSize: '20' }} />}
+                    type="button"
+                    variant="plain"
+                    aria-label={t('console-shared~Increase the Pod count')}
+                    title={t('console-shared~Increase the Pod count')}
+                    onClick={() => handleClick(1)}
+                    isBlock
+                  />
+                </Tooltip>
+              ) : (
+                <Button
+                  icon={<AngleUpIcon style={{ fontSize: '20' }} />}
+                  type="button"
+                  variant="plain"
+                  aria-label={t('console-shared~Increase the Pod count')}
+                  title={t('console-shared~Increase the Pod count')}
+                  onClick={() => handleClick(1)}
+                  isBlock
+                />
+              )}
               <Button
                 icon={<AngleDownIcon style={{ fontSize: '20' }} />}
                 type="button"
diff --git a/frontend/packages/console-shared/src/hooks/__tests__/useNonScalableImageCheck.spec.ts b/frontend/packages/console-shared/src/hooks/__tests__/useNonScalableImageCheck.spec.ts
new file mode 100644
index 00000000000..8435aa0fce0
--- /dev/null
+++ b/frontend/packages/console-shared/src/hooks/__tests__/useNonScalableImageCheck.spec.ts
@@ -0,0 +1,146 @@
+import { renderHook, waitFor } from '@testing-library/react';
+import { k8sGet } from '@console/internal/module/k8s';
+import { useNonScalableImageCheck } from '../useNonScalableImageCheck';
+
+jest.mock('@console/internal/module/k8s', () => ({
+  ...jest.requireActual('@console/internal/module/k8s'),
+  k8sGet: jest.fn(),
+}));
+
+const mockK8sGet = k8sGet as jest.Mock;
+
+const makeDeploymentConfig = (istName?: string, namespace = 'test-ns') => ({
+  kind: 'DeploymentConfig',
+  apiVersion: 'apps.openshift.io/v1',
+  metadata: { name: 'test-dc', namespace },
+  spec: {
+    replicas: 1,
+    triggers: istName
+      ? [
+          {
+            type: 'ImageChange',
+            imageChangeParams: {
+              from: { kind: 'ImageStreamTag', name: istName, namespace },
+            },
+          },
+        ]
+      : [],
+  },
+});
+
+const makeDeployment = (istName?: string, namespace = 'test-ns') => ({
+  kind: 'Deployment',
+  apiVersion: 'apps/v1',
+  metadata: {
+    name: 'test-deploy',
+    namespace,
+    annotations: istName
+      ? {
+          'image.openshift.io/triggers': JSON.stringify([
+            { from: { kind: 'ImageStreamTag', name: istName, namespace } },
+          ]),
+        }
+      : {},
+  },
+  spec: { replicas: 1 },
+});
+
+const makeIST = (nonScalable?: string | boolean) => {
+  const labels: Record<string, string | boolean> = {};
+  if (nonScalable !== undefined) {
+    labels['io.openshift.non-scalable'] = nonScalable;
+  }
+  return {
+    image: {
+      dockerImageMetadata: {
+        Config: {
+          Labels: labels,
+        },
+      },
+    },
+  };
+};
+
+describe('useNonScalableImageCheck', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return isNonScalable=true when IST has io.openshift.non-scalable=true (string)', async () => {
+    mockK8sGet.mockResolvedValue(makeIST('true'));
+    const resource = makeDeploymentConfig('myapp:latest');
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    await waitFor(() => {
+      expect(result.current.isNonScalable).toBe(true);
+      expect(result.current.loading).toBe(false);
+    });
+  });
+
+  it('should return isNonScalable=true when IST has io.openshift.non-scalable=true (boolean)', async () => {
+    mockK8sGet.mockResolvedValue(makeIST(true));
+    const resource = makeDeploymentConfig('myapp:latest');
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    await waitFor(() => {
+      expect(result.current.isNonScalable).toBe(true);
+    });
+  });
+
+  it('should return isNonScalable=false when IST does not have the label', async () => {
+    mockK8sGet.mockResolvedValue(makeIST());
+    const resource = makeDeploymentConfig('myapp:latest');
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    await waitFor(() => {
+      expect(result.current.isNonScalable).toBe(false);
+      expect(result.current.loading).toBe(false);
+    });
+  });
+
+  it('should return isNonScalable=false when there are no triggers', () => {
+    const resource = makeDeploymentConfig();
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    expect(result.current.isNonScalable).toBe(false);
+    expect(result.current.loading).toBe(false);
+    expect(mockK8sGet).not.toHaveBeenCalled();
+  });
+
+  it('should handle Deployment with image.openshift.io/triggers annotation', async () => {
+    mockK8sGet.mockResolvedValue(makeIST('true'));
+    const resource = makeDeployment('myapp:latest');
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    await waitFor(() => {
+      expect(result.current.isNonScalable).toBe(true);
+    });
+  });
+
+  it('should return isNonScalable=false when k8sGet fails', async () => {
+    mockK8sGet.mockRejectedValue(new Error('Forbidden'));
+    const resource = makeDeploymentConfig('myapp:latest');
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    await waitFor(() => {
+      expect(result.current.isNonScalable).toBe(false);
+      expect(result.current.loading).toBe(false);
+    });
+  });
+
+  it('should return isNonScalable=false for Deployment without trigger annotation', () => {
+    const resource = makeDeployment();
+
+    const { result } = renderHook(() => useNonScalableImageCheck(resource));
+
+    expect(result.current.isNonScalable).toBe(false);
+    expect(result.current.loading).toBe(false);
+    expect(mockK8sGet).not.toHaveBeenCalled();
+  });
+});
diff --git a/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts b/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts
new file mode 100644
index 00000000000..2b8c2cf9700
--- /dev/null
+++ b/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts
@@ -0,0 +1,105 @@
+import { useState, useEffect, useMemo } from 'react';
+import * as _ from 'lodash';
+import { ImageStreamTagModel } from '@console/internal/models';
+import type { K8sResourceKind } from '@console/internal/module/k8s';
+import { k8sGet } from '@console/internal/module/k8s';
+
+const NON_SCALABLE_LABEL = 'io.openshift.non-scalable';
+const IMAGE_TRIGGER_ANNOTATION = 'image.openshift.io/triggers';
+
+type ISTReference = {
+  name: string;
+  namespace: string;
+};
+
+const getISTFromDeploymentConfig = (resource: K8sResourceKind): ISTReference | null => {
+  const triggers = resource?.spec?.triggers;
+  if (!Array.isArray(triggers)) {
+    return null;
+  }
+  const imageChangeTrigger = triggers.find((trigger) => trigger.type === 'ImageChange');
+  if (!imageChangeTrigger?.imageChangeParams?.from?.name) {
+    return null;
+  }
+  const { name, namespace } = imageChangeTrigger.imageChangeParams.from;
+  return {
+    name,
+    namespace: namespace || resource.metadata?.namespace,
+  };
+};
+
+const getISTFromTriggerAnnotation = (resource: K8sResourceKind): ISTReference | null => {
+  const annotation = resource?.metadata?.annotations?.[IMAGE_TRIGGER_ANNOTATION];
+  if (!annotation) {
+    return null;
+  }
+  try {
+    const triggers = JSON.parse(annotation);
+    const trigger = Array.isArray(triggers) ? triggers[0] : null;
+    if (!trigger?.from?.name || trigger.from.kind !== 'ImageStreamTag') {
+      return null;
+    }
+    return {
+      name: trigger.from.name,
+      namespace: trigger.from.namespace || resource.metadata?.namespace,
+    };
+  } catch {
+    return null;
+  }
+};
+
+const getISTReference = (resource: K8sResourceKind): ISTReference | null => {
+  if (resource?.kind === 'DeploymentConfig') {
+    return getISTFromDeploymentConfig(resource);
+  }
+  return getISTFromTriggerAnnotation(resource);
+};
+
+/**
+ * Checks if a workload's container image has the `io.openshift.non-scalable` label.
+ * Resolves the ImageStreamTag reference from the workload's triggers or annotations,
+ * fetches the IST, and inspects `image.dockerImageMetadata.Config.Labels`.
+ *
+ * Returns `{ isNonScalable: false }` silently on any error (missing IST, permissions, etc.).
+ */
+export const useNonScalableImageCheck = (
+  resource: K8sResourceKind,
+): { isNonScalable: boolean; loading: boolean } => {
+  const [isNonScalable, setIsNonScalable] = useState(false);
+  const [loading, setLoading] = useState(true);
+
+  const istRef = useMemo(() => getISTReference(resource), [resource]);
+
+  useEffect(() => {
+    if (!istRef) {
+      setIsNonScalable(false);
+      setLoading(false);
+      return undefined;
+    }
+
+    let cancelled = false;
+    setLoading(true);
+
+    k8sGet(ImageStreamTagModel, istRef.name, istRef.namespace)
+      .then((ist: K8sResourceKind) => {
+        if (!cancelled) {
+          const labels = _.get(ist, 'image.dockerImageMetadata.Config.Labels', {});
+          const nonScalableValue = labels[NON_SCALABLE_LABEL];
+          setIsNonScalable(nonScalableValue === true || nonScalableValue === 'true');
+          setLoading(false);
+        }
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setIsNonScalable(false);
+          setLoading(false);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [istRef]);
+
+  return { isNonScalable, loading };
+};
diff --git a/frontend/public/components/modals/__tests__/configure-count-modal.spec.tsx b/frontend/public/components/modals/__tests__/configure-count-modal.spec.tsx
new file mode 100644
index 00000000000..49a6ca8152c
--- /dev/null
+++ b/frontend/public/components/modals/__tests__/configure-count-modal.spec.tsx
@@ -0,0 +1,107 @@
+import { screen, configure } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { ConfigureCountModal } from '@console/internal/components/modals/configure-count-modal';
+import { DeploymentConfigModel } from '@console/internal/models';
+import { useNonScalableImageCheck } from '@console/shared/src/hooks/useNonScalableImageCheck';
+import { renderWithProviders } from '@console/shared/src/test-utils/unit-test-utils';
+
+jest.mock('@console/shared/src/hooks/useNonScalableImageCheck', () => ({
+  ...jest.requireActual('@console/shared/src/hooks/useNonScalableImageCheck'),
+  useNonScalableImageCheck: jest.fn(),
+}));
+
+jest.mock('@console/shared/src/hooks/usePromiseHandler', () => ({
+  usePromiseHandler: () => [jest.fn().mockResolvedValue(undefined), false, ''],
+}));
+
+const mockUseNonScalableImageCheck = useNonScalableImageCheck as jest.Mock;
+
+const baseProps = {
+  defaultValue: 0,
+  titleKey: 'public~Edit Pod count',
+  messageKey: 'public~{{resourceKinds}} maintain the desired number of healthy pods.',
+  messageVariables: { resourceKinds: 'Deployments' },
+  path: '/spec/replicas',
+  buttonTextKey: 'public~Save',
+  resource: {
+    kind: 'DeploymentConfig',
+    apiVersion: 'apps.openshift.io/v1',
+    metadata: { name: 'test-dc', namespace: 'test-ns' },
+    spec: {
+      replicas: 1,
+      triggers: [
+        {
+          type: 'ImageChange',
+          imageChangeParams: {
+            from: { kind: 'ImageStreamTag', name: 'myapp:latest', namespace: 'test-ns' },
+          },
+        },
+      ],
+    },
+  },
+  resourceKind: DeploymentConfigModel,
+  opts: { path: 'scale' },
+  closeOverlay: jest.fn(),
+};
+
+describe('ConfigureCountModal - Non-scalable image warning', () => {
+  beforeAll(() => {
+    configure({ testIdAttribute: 'data-test' });
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseNonScalableImageCheck.mockReturnValue({ isNonScalable: false, loading: false });
+  });
+
+  it('should show warning when image is non-scalable and value > 1', () => {
+    mockUseNonScalableImageCheck.mockReturnValue({ isNonScalable: true, loading: false });
+
+    const resource = {
+      ...baseProps.resource,
+      spec: { ...baseProps.resource.spec, replicas: 2 },
+    };
+    renderWithProviders(<ConfigureCountModal {...baseProps} resource={resource} />);
+
+    expect(screen.getByText('Non-scalable image')).toBeVisible();
+    expect(
+      screen.getByText(
+        'This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.',
+      ),
+    ).toBeVisible();
+  });
+
+  it('should not show warning when image is non-scalable but value is 1', () => {
+    mockUseNonScalableImageCheck.mockReturnValue({ isNonScalable: true, loading: false });
+
+    renderWithProviders(<ConfigureCountModal {...baseProps} />);
+
+    expect(screen.queryByText('Non-scalable image')).toBeNull();
+  });
+
+  it('should not show warning when image is scalable', () => {
+    mockUseNonScalableImageCheck.mockReturnValue({ isNonScalable: false, loading: false });
+
+    const resource = {
+      ...baseProps.resource,
+      spec: { ...baseProps.resource.spec, replicas: 3 },
+    };
+    renderWithProviders(<ConfigureCountModal {...baseProps} resource={resource} />);
+
+    expect(screen.queryByText('Non-scalable image')).toBeNull();
+  });
+
+  it('should not show warning for non-replica paths (e.g., parallelism)', () => {
+    mockUseNonScalableImageCheck.mockReturnValue({ isNonScalable: true, loading: false });
+
+    const resource = {
+      ...baseProps.resource,
+      spec: { ...baseProps.resource.spec, parallelism: 3 },
+    };
+    renderWithProviders(
+      <ConfigureCountModal {...baseProps} path="/spec/parallelism" resource={resource} />,
+    );
+
+    expect(screen.queryByText('Non-scalable image')).toBeNull();
+  });
+});
diff --git a/frontend/public/components/modals/configure-count-modal.tsx b/frontend/public/components/modals/configure-count-modal.tsx
index 3653fc2f30c..d102d3004e9 100644
--- a/frontend/public/components/modals/configure-count-modal.tsx
+++ b/frontend/public/components/modals/configure-count-modal.tsx
@@ -1,7 +1,15 @@
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { useState, useCallback } from 'react';
-import { Modal, ModalHeader, ModalBody, Button, FormGroup, Form } from '@patternfly/react-core';
+import {
+  Alert,
+  Modal,
+  ModalHeader,
+  ModalBody,
+  Button,
+  FormGroup,
+  Form,
+} from '@patternfly/react-core';
 import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
 import { OverlayComponent } from '@console/dynamic-plugin-sdk/src/app/modal-support/OverlayProvider';
@@ -9,6 +17,7 @@ import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s';
 import { K8sResourceKind, K8sModel } from '../../module/k8s';
 import { NumberSpinner, NumberSpinnerProps } from '../utils/number-spinner';
 import { usePromiseHandler } from '@console/shared/src/hooks/usePromiseHandler';
+import { useNonScalableImageCheck } from '@console/shared/src/hooks/useNonScalableImageCheck';
 import { ModalFooterWithAlerts } from '@console/shared/src/components/modals/ModalFooterWithAlerts';
 
 export const ConfigureCountModal: OverlayComponent<ConfigureCountModalProps> = (props) => {
@@ -34,6 +43,8 @@ export const ConfigureCountModal: OverlayComponent<ConfigureCountModalProps> = (
   const [value, setValue] = useState<number>(_.get(resource, getPath) ?? defaultValue);
   const { t } = useTranslation();
   const [handlePromise, inProgress, errorMessage] = usePromiseHandler();
+  const isReplicaPath = path === '/spec/replicas';
+  const { isNonScalable } = useNonScalableImageCheck(resource);
 
   const submit = useCallback(
     (e) => {
@@ -87,6 +98,18 @@ export const ConfigureCountModal: OverlayComponent<ConfigureCountModalProps> = (
         description={messageKey ? t(messageKey, messageVariablesSafe) : message}
       />
       <ModalBody>
+        {isReplicaPath && isNonScalable && value > 1 && (
+          <Alert
+            variant="warning"
+            isInline
+            title={t('public~Non-scalable image')}
+            className="pf-v6-u-mb-md"
+          >
+            {t(
+              'public~This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.',
+            )}
+          </Alert>
+        )}
         <Form id="configure-count-form">
           <FormGroup>
             <NumberSpinner
diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
index 8f88dcc2ff4..9c25f2ca766 100644
--- a/frontend/public/locales/en/public.json
+++ b/frontend/public/locales/en/public.json
@@ -1753,6 +1753,8 @@
   "Rebuild": "Rebuild",
   "Cancel build": "Cancel build",
   "Edit Pod count": "Edit Pod count",
+  "Non-scalable image": "Non-scalable image",
+  "This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.": "This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.",
   "{{resourceKinds}} maintain the desired number of healthy pods.": "{{resourceKinds}} maintain the desired number of healthy pods.",
   "Impersonate Group {{name}}": "Impersonate Group {{name}}",
   "Add Users": "Add Users",

From b744665e460ad3554c9c44da2ae56031a471694e Mon Sep 17 00:00:00 2001
From: Swapnil <shendeswapnil.6@gmail.com>
Date: Tue, 12 May 2026 22:20:41 +0530
Subject: [PATCH 2/4] fixup: Address CodeRabbit review feedback

- Validate ImageStreamTag kind in DeploymentConfig triggers before resolving
- Scan all annotation triggers instead of only the first one
- Use stable primitives (name, namespace) as effect dependencies

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../src/hooks/useNonScalableImageCheck.ts     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts b/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts
index 2b8c2cf9700..3cf1dc972c2 100644
--- a/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts
+++ b/frontend/packages/console-shared/src/hooks/useNonScalableImageCheck.ts
@@ -17,8 +17,13 @@ const getISTFromDeploymentConfig = (resource: K8sResourceKind): ISTReference | n
   if (!Array.isArray(triggers)) {
     return null;
   }
-  const imageChangeTrigger = triggers.find((trigger) => trigger.type === 'ImageChange');
-  if (!imageChangeTrigger?.imageChangeParams?.from?.name) {
+  const imageChangeTrigger = triggers.find(
+    (trigger) =>
+      trigger.type === 'ImageChange' &&
+      trigger?.imageChangeParams?.from?.kind === 'ImageStreamTag' &&
+      !!trigger?.imageChangeParams?.from?.name,
+  );
+  if (!imageChangeTrigger) {
     return null;
   }
   const { name, namespace } = imageChangeTrigger.imageChangeParams.from;
@@ -35,8 +40,10 @@ const getISTFromTriggerAnnotation = (resource: K8sResourceKind): ISTReference |
   }
   try {
     const triggers = JSON.parse(annotation);
-    const trigger = Array.isArray(triggers) ? triggers[0] : null;
-    if (!trigger?.from?.name || trigger.from.kind !== 'ImageStreamTag') {
+    const trigger = Array.isArray(triggers)
+      ? triggers.find((t) => t?.from?.kind === 'ImageStreamTag' && !!t?.from?.name)
+      : null;
+    if (!trigger) {
       return null;
     }
     return {
@@ -69,9 +76,11 @@ export const useNonScalableImageCheck = (
   const [loading, setLoading] = useState(true);
 
   const istRef = useMemo(() => getISTReference(resource), [resource]);
+  const istName = istRef?.name;
+  const istNamespace = istRef?.namespace;
 
   useEffect(() => {
-    if (!istRef) {
+    if (!istName || !istNamespace) {
       setIsNonScalable(false);
       setLoading(false);
       return undefined;
@@ -80,7 +89,7 @@ export const useNonScalableImageCheck = (
     let cancelled = false;
     setLoading(true);
 
-    k8sGet(ImageStreamTagModel, istRef.name, istRef.namespace)
+    k8sGet(ImageStreamTagModel, istName, istNamespace)
       .then((ist: K8sResourceKind) => {
         if (!cancelled) {
           const labels = _.get(ist, 'image.dockerImageMetadata.Config.Labels', {});
@@ -99,7 +108,7 @@ export const useNonScalableImageCheck = (
     return () => {
       cancelled = true;
     };
-  }, [istRef]);
+  }, [istName, istNamespace]);
 
   return { isNonScalable, loading };
 };

From 501feaf02d0cd1ffbde444c64af7a415cb27b678 Mon Sep 17 00:00:00 2001
From: Swapnil <shendeswapnil.6@gmail.com>
Date: Wed, 13 May 2026 06:34:32 +0530
Subject: [PATCH 3/4] fixup: Run yarn i18n to fix locale key placement

Moves new i18n keys to the parser-determined position and removes
orphaned keys no longer referenced after the modal rewrite on main.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 frontend/public/locales/en/public.json | 80 ++------------------------
 1 file changed, 4 insertions(+), 76 deletions(-)

diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
index 9c25f2ca766..7f6e3a8e3be 100644
--- a/frontend/public/locales/en/public.json
+++ b/frontend/public/locales/en/public.json
@@ -872,6 +872,8 @@
   "Receive update information from Red Hat.": "Receive update information from Red Hat.",
   "Custom update service": "Custom update service",
   "Please enter a URL.": "Please enter a URL.",
+  "Non-scalable image": "Non-scalable image",
+  "This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.": "This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.",
   "{{resourceKinds}} create one or more pods and ensure that a specified number of them successfully terminate. When the specified number of completions is successfully reached, the job is complete.": "{{resourceKinds}} create one or more pods and ensure that a specified number of them successfully terminate. When the specified number of completions is successfully reached, the job is complete.",
   "Create MachineAutoscaler": "Create MachineAutoscaler",
   "This will automatically scale machine set {{ name }}.": "This will automatically scale machine set {{ name }}.",
@@ -1739,79 +1741,5 @@
   "Exec command": "Exec command",
   "HTTP GET": "HTTP GET",
   "TCP socket (port)": "TCP socket (port)",
-  "gRPC": "gRPC",
-  "Delete {{label}} subject?": "Delete {{label}} subject?",
-  "Are you sure you want to delete subject {{name}} of type {{kind}}?": "Are you sure you want to delete subject {{name}} of type {{kind}}?",
-  "Impersonate {{kind}} \"{{name}}\"": "Impersonate {{kind}} \"{{name}}\"",
-  "Duplicate {{kindLabel}}": "Duplicate {{kindLabel}}",
-  "Edit {{kindLabel}} subject": "Edit {{kindLabel}} subject",
-  "Delete {{label}} subject": "Delete {{label}} subject",
-  "Cancel build?": "Cancel build?",
-  "Are you sure you want to cancel build {{name}}?": "Are you sure you want to cancel build {{name}}?",
-  "Yes, cancel": "Yes, cancel",
-  "No, don't cancel": "No, don't cancel",
-  "Rebuild": "Rebuild",
-  "Cancel build": "Cancel build",
-  "Edit Pod count": "Edit Pod count",
-  "Non-scalable image": "Non-scalable image",
-  "This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.": "This image is not intended to run with more than one replica. Running multiple instances may cause unexpected behavior.",
-  "{{resourceKinds}} maintain the desired number of healthy pods.": "{{resourceKinds}} maintain the desired number of healthy pods.",
-  "Impersonate Group {{name}}": "Impersonate Group {{name}}",
-  "Add Users": "Add Users",
-  "Edit Machine count": "Edit Machine count",
-  "Start build": "Start build",
-  "Start last run": "Start last run",
-  "Pause updates": "Pause updates",
-  "Add RoleBinding": "Add RoleBinding",
-  "Impersonate User {{name}}": "Impersonate User {{name}}",
-  "Admission Webhook Warning": "Admission Webhook Warning",
-  "{{kind}} {{name}} violates policy {{warning}}": "{{kind}} {{name}} violates policy {{warning}}",
-  "Learn more": "Learn more",
-  "Go to first page": "Go to first page",
-  "Go to previous page": "Go to previous page",
-  "Go to next page": "Go to next page",
-  "Go to last page": "Go to last page",
-  "Filter by name": "Filter by name",
-  "Reset column widths": "Reset column widths",
-  "{{label}} table": "{{label}} table",
-  "Filter by label": "Filter by label",
-  "Selected group is unavailable": "Selected group is unavailable",
-  "Enter at least one user": "Enter at least one user",
-  "Error occurred": "Error occurred",
-  "Add new users to group {{name}}": "Add new users to group {{name}}",
-  "Are you sure you want to remove <1>{{label}}</1> from navigation?": "Are you sure you want to remove <1>{{label}}</1> from navigation?",
-  "Select a path": "Select a path",
-  "Select a log file": "Select a log file",
-  "Error fetching logs: {{message}}": "Error fetching logs: {{message}}",
-  "Error fetching log filenames: {{message}}": "Error fetching log filenames: {{message}}",
-  "The log is abridged due to length.": "The log is abridged due to length.",
-  "To view unabridged log content, <2>open the raw file in another window</2>.": "To view unabridged log content, <2>open the raw file in another window</2>.",
-  "No log file selected": "No log file selected",
-  "No log files exist": "No log files exist",
-  "Select a log file above": "Select a log file above",
-  "Filter by unit": "Filter by unit",
-  "Unit": "Unit",
-  "Content Security Policy violation in Console plugin": "Content Security Policy violation in Console plugin",
-  "{{pluginName}} might have violated the Console Content Security Policy. Refer to the browser's console logs for details.": "{{pluginName}} might have violated the Console Content Security Policy. Refer to the browser's console logs for details.",
-  "prometheusBaseURL not set": "prometheusBaseURL not set",
-  "alertManagerBaseURL not set": "alertManagerBaseURL not set",
-  "Critical": "Critical",
-  "Loading {{title}} status": "Loading {{title}} status",
-  "Waiting for the build": "Waiting for the build",
-  "graph timespan": "graph timespan",
-  "Reset zoom": "Reset zoom",
-  "Displaying with reduced resolution due to large dataset.": "Displaying with reduced resolution due to large dataset.",
-  "query browser chart": "query browser chart",
-  "Ungraphable results": "Ungraphable results",
-  "Query results include range vectors, which cannot be graphed. Try adding a function to transform the data.": "Query results include range vectors, which cannot be graphed. Try adding a function to transform the data.",
-  "Query result is a string, which cannot be graphed.": "Query result is a string, which cannot be graphed.",
-  "The resulting dataset is too large to graph.": "The resulting dataset is too large to graph.",
-  "Stacked": "Stacked",
-  "unknown host": "unknown host",
-  "Unknown user": "Unknown user",
-  "Just now": "Just now",
-  "Delete {{kind}}": "Delete {{kind}}",
-  "Disable": "Disable",
-  "Disabled": "Disabled",
-  "Enabled": "Enabled"
-}
\ No newline at end of file
+  "gRPC": "gRPC"
+}

From 77fa443a0b084be18f35c0bc4d72e310d3cfa5e5 Mon Sep 17 00:00:00 2001
From: Swapnil <shendeswapnil.6@gmail.com>
Date: Wed, 13 May 2026 09:33:16 +0530
Subject: [PATCH 4/4] fixup: Fix i18n key placement and trailing newline

Move Non-scalable image keys to parser-determined position (after
"Please enter a URL." at line 874) and restore all existing keys.
Remove trailing newline from console-shared.json to match parser output.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../locales/en/console-shared.json            |  2 +-
 frontend/public/locales/en/public.json        | 76 ++++++++++++++++++-
 2 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/frontend/packages/console-shared/locales/en/console-shared.json b/frontend/packages/console-shared/locales/en/console-shared.json
index 266bcf1870e..587092d8fbc 100644
--- a/frontend/packages/console-shared/locales/en/console-shared.json
+++ b/frontend/packages/console-shared/locales/en/console-shared.json
@@ -321,4 +321,4 @@
   "Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.": "Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.",
   "Cannot be longer than {{characterCount}} characters.": "Cannot be longer than {{characterCount}} characters.",
   "Required": "Required"
-}
+}
\ No newline at end of file
diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
index 7f6e3a8e3be..5d2b692b228 100644
--- a/frontend/public/locales/en/public.json
+++ b/frontend/public/locales/en/public.json
@@ -1741,5 +1741,77 @@
   "Exec command": "Exec command",
   "HTTP GET": "HTTP GET",
   "TCP socket (port)": "TCP socket (port)",
-  "gRPC": "gRPC"
-}
+  "gRPC": "gRPC",
+  "Delete {{label}} subject?": "Delete {{label}} subject?",
+  "Are you sure you want to delete subject {{name}} of type {{kind}}?": "Are you sure you want to delete subject {{name}} of type {{kind}}?",
+  "Impersonate {{kind}} \"{{name}}\"": "Impersonate {{kind}} \"{{name}}\"",
+  "Duplicate {{kindLabel}}": "Duplicate {{kindLabel}}",
+  "Edit {{kindLabel}} subject": "Edit {{kindLabel}} subject",
+  "Delete {{label}} subject": "Delete {{label}} subject",
+  "Cancel build?": "Cancel build?",
+  "Are you sure you want to cancel build {{name}}?": "Are you sure you want to cancel build {{name}}?",
+  "Yes, cancel": "Yes, cancel",
+  "No, don't cancel": "No, don't cancel",
+  "Rebuild": "Rebuild",
+  "Cancel build": "Cancel build",
+  "Edit Pod count": "Edit Pod count",
+  "{{resourceKinds}} maintain the desired number of healthy pods.": "{{resourceKinds}} maintain the desired number of healthy pods.",
+  "Impersonate Group {{name}}": "Impersonate Group {{name}}",
+  "Add Users": "Add Users",
+  "Edit Machine count": "Edit Machine count",
+  "Start build": "Start build",
+  "Start last run": "Start last run",
+  "Pause updates": "Pause updates",
+  "Add RoleBinding": "Add RoleBinding",
+  "Impersonate User {{name}}": "Impersonate User {{name}}",
+  "Admission Webhook Warning": "Admission Webhook Warning",
+  "{{kind}} {{name}} violates policy {{warning}}": "{{kind}} {{name}} violates policy {{warning}}",
+  "Learn more": "Learn more",
+  "Go to first page": "Go to first page",
+  "Go to previous page": "Go to previous page",
+  "Go to next page": "Go to next page",
+  "Go to last page": "Go to last page",
+  "Filter by name": "Filter by name",
+  "Reset column widths": "Reset column widths",
+  "{{label}} table": "{{label}} table",
+  "Filter by label": "Filter by label",
+  "Selected group is unavailable": "Selected group is unavailable",
+  "Enter at least one user": "Enter at least one user",
+  "Error occurred": "Error occurred",
+  "Add new users to group {{name}}": "Add new users to group {{name}}",
+  "Are you sure you want to remove <1>{{label}}</1> from navigation?": "Are you sure you want to remove <1>{{label}}</1> from navigation?",
+  "Select a path": "Select a path",
+  "Select a log file": "Select a log file",
+  "Error fetching logs: {{message}}": "Error fetching logs: {{message}}",
+  "Error fetching log filenames: {{message}}": "Error fetching log filenames: {{message}}",
+  "The log is abridged due to length.": "The log is abridged due to length.",
+  "To view unabridged log content, <2>open the raw file in another window</2>.": "To view unabridged log content, <2>open the raw file in another window</2>.",
+  "No log file selected": "No log file selected",
+  "No log files exist": "No log files exist",
+  "Select a log file above": "Select a log file above",
+  "Filter by unit": "Filter by unit",
+  "Unit": "Unit",
+  "Content Security Policy violation in Console plugin": "Content Security Policy violation in Console plugin",
+  "{{pluginName}} might have violated the Console Content Security Policy. Refer to the browser's console logs for details.": "{{pluginName}} might have violated the Console Content Security Policy. Refer to the browser's console logs for details.",
+  "prometheusBaseURL not set": "prometheusBaseURL not set",
+  "alertManagerBaseURL not set": "alertManagerBaseURL not set",
+  "Critical": "Critical",
+  "Loading {{title}} status": "Loading {{title}} status",
+  "Waiting for the build": "Waiting for the build",
+  "graph timespan": "graph timespan",
+  "Reset zoom": "Reset zoom",
+  "Displaying with reduced resolution due to large dataset.": "Displaying with reduced resolution due to large dataset.",
+  "query browser chart": "query browser chart",
+  "Ungraphable results": "Ungraphable results",
+  "Query results include range vectors, which cannot be graphed. Try adding a function to transform the data.": "Query results include range vectors, which cannot be graphed. Try adding a function to transform the data.",
+  "Query result is a string, which cannot be graphed.": "Query result is a string, which cannot be graphed.",
+  "The resulting dataset is too large to graph.": "The resulting dataset is too large to graph.",
+  "Stacked": "Stacked",
+  "unknown host": "unknown host",
+  "Unknown user": "Unknown user",
+  "Just now": "Just now",
+  "Delete {{kind}}": "Delete {{kind}}",
+  "Disable": "Disable",
+  "Disabled": "Disabled",
+  "Enabled": "Enabled"
+}
\ No newline at end of file