[PLAT-16368]: Disallow encryption at transit for K8 universes in EDIT…

… mode Summary: Disallow encryption at transit for K8 universes in EDIT mode Also by mistake in this diff D39943, I disallowed cert rotation, but the intention should be dis-allow enabling tls after universe deployment but we still want to support certs rotate Test Plan: Refer to the video {F319735} Reviewers: jmak, anijhawan, vbansal Reviewed By: vbansal Subscribers: yugaware Differential Revision: https://phorge.dev.yugabyte.com/D40782
yugabyte · Dec 31, 2024 · bab843a · bab843a
1 parent f340171
commit bab843a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/managed/ui/src/components/universes/SecurityModal/SecurityMenu.js b/managed/ui/src/components/universes/SecurityModal/SecurityMenu.js
@@ -7,12 +7,13 @@ import { UNIVERSE_TASKS } from '../../../redesign/helpers/constants';
 
 export function SecurityMenu({
   backToMainMenu,
-  isItKubernetesUniverse,
   editTLSAvailability,
   showTLSConfigurationModal,
   showManageKeyModal,
   manageKeyAvailability,
-  allowedTasks
+  allowedTasks,
+  isEncryptionAtTransitEnabled,
+  isItKubernetesUniverse
 }) {
   const { test, released } = useSelector((state) => state.featureFlags);
 
@@ -34,7 +35,7 @@ export function SecurityMenu({
         availability={tlsAvailability}
         disabled={
           isActionFrozen(allowedTasks, UNIVERSE_TASKS.ENCRYPTION_IN_TRANSIT) ||
-          isItKubernetesUniverse
+          (isItKubernetesUniverse && !isEncryptionAtTransitEnabled)
         }
       >
         Encryption in-Transit

diff --git a/managed/ui/src/components/universes/UniverseDetail/UniverseDetail.js b/managed/ui/src/components/universes/UniverseDetail/UniverseDetail.js
@@ -362,6 +362,10 @@ class UniverseDetail extends Component {
     );
     const useSystemd = primaryCluster?.userIntent?.useSystemd;
     const isYSQLEnabledInUniverse = primaryCluster?.userIntent?.enableYSQL;
+    const isEncryptionAtTransitEnabled = !!(
+      primaryCluster?.userIntent?.enableNodeToNodeEncrypt ||
+      primaryCluster?.userIntent.enableClientToNodeEncrypt
+    );
     const isReadOnlyUniverse =
       getPromiseState(currentUniverse).isSuccess() &&
       currentUniverse.data.universeDetails.capability === 'READ_ONLY';
@@ -1540,12 +1544,13 @@ class UniverseDetail extends Component {
                   <>
                     <SecurityMenu
                       backToMainMenu={() => setActiveSubmenu(ActionMenu.MORE)}
-                      isItKubernetesUniverse={isKubernetesUniverse}
                       allowedTasks={allowedTasks}
                       showTLSConfigurationModal={showTLSConfigurationModal}
                       editTLSAvailability={editTLSAvailability}
                       showManageKeyModal={showManageKeyModal}
                       manageKeyAvailability={manageKeyAvailability}
+                      isEncryptionAtTransitEnabled={isEncryptionAtTransitEnabled}
+                      isItKubernetesUniverse={isKubernetesUniverse}
                     />
                   </>
                 )