Merge pull request #10944 from openshift-cherrypick-robot/cherry-pick…

…-10491-to-release-4.9 [release-4.9] Bug 2046641: Add warning alert when installing operator to non suggested namespace
openshift · Mar 2, 2022 · 7271cb2 · 7271cb2
2 parents 8d748bd + 4f8684e
commit 7271cb2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/frontend/packages/operator-lifecycle-manager/locales/en/olm.json b/frontend/packages/operator-lifecycle-manager/locales/en/olm.json
@@ -274,6 +274,7 @@
   "Please note that installing non-Red Hat operators into OpenShift namespaces and enabling monitoring voids user support. Enabling cluster monitoring for non-Red Hat operators can lead to malicious metrics data overriding existing cluster metrics. For more information, see the <2>cluster monitoring documentation</2>.": "Please note that installing non-Red Hat operators into OpenShift namespaces and enabling monitoring voids user support. Enabling cluster monitoring for non-Red Hat operators can lead to malicious metrics data overriding existing cluster metrics. For more information, see the <2>cluster monitoring documentation</2>.",
   "Operator recommended Namespace:": "Operator recommended Namespace:",
   "Select a Namespace": "Select a Namespace",
+  "Not installing the Operator into the recommended namespace can cause unexpected behavior.": "Not installing the Operator into the recommended namespace can cause unexpected behavior.",
   "Operator Installation": "Operator Installation",
   "Install Operator": "Install Operator",
   "Install your Operator by subscribing to one of the update channels to keep the Operator up to date. The strategy determines either manual or automatic updates.": "Install your Operator by subscribing to one of the update channels to keep the Operator up to date. The strategy determines either manual or automatic updates.",

diff --git a/...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx b/...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx
@@ -620,12 +620,24 @@ export const OperatorHubSubscribeForm: React.FC<OperatorHubSubscribeFormProps> =
         title={t('olm~Select a Namespace')}
       />
       {!useSuggestedNSForSingleInstallMode && (
-        <NsDropdown
-          id="dropdown-selectbox"
-          selectedKey={selectedTargetNamespace}
-          onChange={(ns) => setTargetNamespace(ns)}
-          dataTest="dropdown-selectbox"
-        />
+        <>
+          <NsDropdown
+            id="dropdown-selectbox"
+            selectedKey={selectedTargetNamespace}
+            onChange={(ns) => setTargetNamespace(ns)}
+            dataTest="dropdown-selectbox"
+          />
+          {suggestedNamespace !== selectedTargetNamespace && (
+            <Alert
+              isInline
+              className="co-alert pf-c-alert--top-margin"
+              variant="warning"
+              title={t(
+                'olm~Not installing the Operator into the recommended namespace can cause unexpected behavior.',
+              )}
+            />
+          )}
+        </>
       )}
     </div>
   );