Changes to remove the new field added

openshift-assisted · Jan 8, 2025 · d076e74 · d076e74
1 parent 815637d
commit d076e74
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx b/libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDeploymentDetailsForm.tsx
@@ -39,10 +39,6 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
     : undefined;
   const isEditFlow = !!clusterDeployment;
 
-  const agentControlPlaneAgents = agentClusterInstall
-    ? agentClusterInstall.spec?.provisionRequirements.controlPlaneAgents
-    : 3;
-
   const { values } = useFormikContext<ClusterDetailsValues>();
 
   const cpuArchitectures = React.useMemo(() => {
@@ -81,7 +77,6 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
           extensionAfter={extensionAfter}
           isNutanix={isNutanix}
           cpuArchitectures={cpuArchitectures}
-          agentControlPlaneAgents={agentControlPlaneAgents}
         />
       </StackItem>
     </Stack>

diff --git a/libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx b/libs/ui-lib/lib/cim/components/ClusterDeployment/ClusterDetailsFormFields.tsx
@@ -23,7 +23,6 @@ export type ClusterDetailsFormFieldsProps = {
   versions: OpenshiftVersionOptionType[];
   isNutanix?: boolean;
   cpuArchitectures?: string[];
-  agentControlPlaneAgents?: number;
 };
 
 export const BaseDnsHelperText: React.FC<{ name?: string; baseDnsDomain?: string }> = ({
@@ -51,7 +50,6 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   extensionAfter,
   isNutanix,
   cpuArchitectures,
-  agentControlPlaneAgents,
 }) => {
   const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain } = values;
@@ -112,11 +110,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           }}
         />
       )}
-      <ControlPlaneNodesDropdown
-        isNutanix={isNutanix}
-        isDisabled={isEditFlow}
-        agentControlPlaneAgents={agentControlPlaneAgents}
-      />
+      <ControlPlaneNodesDropdown isNutanix={isNutanix} isDisabled={isEditFlow} />
       {!isNutanix && (
         <CpuArchitectureDropdown cpuArchitectures={cpuArchitectures} isDisabled={isEditFlow} />
       )}

diff --git a/libs/ui-lib/lib/cim/components/helpers/toAssisted.ts b/libs/ui-lib/lib/cim/components/helpers/toAssisted.ts
@@ -170,6 +170,7 @@ export const getAICluster = ({
     validationsInfo: JSON.stringify(agentClusterInstall?.status?.validationsInfo || {}),
     cpuArchitecture: getClusterDeploymentCpuArchitecture(clusterDeployment, infraEnv),
     networkType: agentClusterInstall?.spec?.networking.networkType,
+    controlPlaneCount: agentClusterInstall?.spec?.provisionRequirements.controlPlaneAgents || 3,
   };
   /*
   aiCluster.agentSelectorMasterLabels =

diff --git a/libs/ui-lib/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx b/libs/ui-lib/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx
@@ -18,11 +18,9 @@ const isDropdownItemEnabled = (controlPlaneNodeCount: number, isNutanix?: boolea
 const ControlPlaneNodesDropdown = ({
   isDisabled = false,
   isNutanix,
-  agentControlPlaneAgents,
 }: {
   isDisabled?: boolean;
   isNutanix?: boolean;
-  agentControlPlaneAgents?: number;
 }) => {
   const { t } = useTranslation();
   const [{ name, value: selectedValue }, , { setValue }] = useField<number | 3>(
@@ -87,7 +85,7 @@ const ControlPlaneNodesDropdown = ({
       label={t('ai:Number of control plane nodes')}
       isRequired
     >
-      {agentControlPlaneAgents}
+      {selectedValue}
     </StaticField>
   );
 };

diff --git a/libs/ui-lib/lib/common/components/clusterWizard/clusterDetailsValidation.ts b/libs/ui-lib/lib/common/components/clusterWizard/clusterDetailsValidation.ts
@@ -82,7 +82,7 @@ export const getClusterDetailsInitialValues = ({
     platform: cluster?.platform?.type || 'none',
     customOpenshiftSelect: null,
     userManagedNetworking: cluster?.userManagedNetworking || false,
-    controlPlaneCount: cluster?.controlPlaneCount || 3,
+    controlPlaneAgents: cluster?.controlPlaneCount || 3,
   };
 };
 

diff --git a/libs/ui-lib/lib/common/components/clusterWizard/types.ts b/libs/ui-lib/lib/common/components/clusterWizard/types.ts
@@ -34,7 +34,7 @@ export type ClusterDetailsValues = {
   platform: PlatformType;
   customOpenshiftSelect: OpenshiftVersionOptionType | null;
   userManagedNetworking: boolean;
-  controlPlaneCount: number;
+  controlPlaneAgents: number;
 };
 
 export type HostsValidationsProps<S extends string, V extends string[]> = {