Revert "Merge branch 'master' into MGMT-18987-Allow-ISO-full-types-2.14"

This reverts commit 8c5718a, reversing
changes made to 41b146a.

r

apps/assisted-ui/package.json

@@ -10,7 +10,7 @@
     "@patternfly/react-table": "5.2.0",
     "@patternfly/react-tokens": "5.2.0",
     "@reduxjs/toolkit": "^1.9.1",
-    "@sentry/browser": "^7.119",
+    "@sentry/browser": "^5.9 || ^6",
     "axios": ">=0.22.0 <2.0.0",
     "i18next": "^20.4.0",
     "i18next-browser-languagedetector": "^6.1.2",

libs/locales/lib/en/translation.json

@@ -471,7 +471,6 @@
   "ai:Learn more": "Learn more",
   "ai:Learn more about configuration.": "Learn more about configuration.",
   "ai:Learn more about enabling CIM on AWS <1></1>": "Learn more about enabling CIM on AWS <1></1>",
-  "ai:Learn more about MTU (maximum transmission unit)": "Learn more about MTU (maximum transmission unit)",
   "ai:Learn more about OpenShift releases": "Learn more about OpenShift releases",
   "ai:Learn more about pull secrets and view examples": "Learn more about pull secrets and view examples",
   "ai:Learn more about storage class": "Learn more about storage class",
@@ -508,7 +507,6 @@
   "ai:Memory capacity": "Memory capacity",
   "ai:Message": "Message",
   "ai:Metal3 operator is not configured": "Metal3 operator is not configured",
-  "ai:Migration Toolkit for Virtualization": "Migration Toolkit for Virtualization",
   "ai:Migration toolkit for virtualization requirements": "Migration toolkit for virtualization requirements",
   "ai:Minimal image file": "Minimal image file",
   "ai:Minimal value is 10Gi": "Minimal value is 10Gi",
@@ -527,8 +525,6 @@
   "ai:More info for image storage": "More information for image storage",
   "ai:More info for load balancer on Amazon web services": "More information for load balancer on Amazon web services",
   "ai:More info for system storage": "More information for system storage",
-  "ai:MTU (maximum transmission unit) failure": "MTU (maximum transmission unit) failure",
-  "ai:MTU requirements": "MTU requirements",
   "ai:Multicluster engine": "Multicluster engine",
   "ai:Multicluster engine requirements": "Multicluster engine requirements",
   "ai:Must be at least 1": "Must be at least 1",
@@ -616,8 +612,6 @@
   "ai:OpenShift Cluster Manager": "OpenShift Cluster Manager",
   "ai:OpenShift Data Foundation": "OpenShift Data Foundation",
   "ai:OpenShift in-place upgrades aren't expected to work with SNO. If an upgrade is needed, your system will need a redeployment.": "OpenShift in-place upgrades are not expected to work with SNO. If an upgrade is needed, your system to be redeployed.",
-  "ai:OpenShift sandboxed containers": "OpenShift sandboxed containers",
-  "ai:OpenShift sandboxed containers requirements": "OpenShift sandboxed containers requirements",
   "ai:OpenShift version": "OpenShift version",
   "ai:OpenShift Virtualization": "OpenShift Virtualization",
   "ai:OpenShift Web Console troubleshooting": "OpenShift Web Console troubleshooting",

libs/types/assisted-installer-service.d.ts

@@ -83,7 +83,6 @@ export interface Boot {
   currentBootMode?: string;
   pxeInterface?: string;
   commandLine?: string;
-  secureBootState?: SecureBootState;
 }
 export interface Cluster {
   /**
@@ -368,18 +367,14 @@ export interface Cluster {
    * Indication if organization soft timeouts is enabled for the cluster.
    */
   orgSoftTimeoutsEnabled?: boolean;
-  /**
-   * Specifies the required number of control plane nodes that should be part of the cluster.
-   */
-  controlPlaneCount?: number;
 }
 export interface ClusterCreateParams {
   /**
    * Name of the OpenShift cluster.
    */
   name: string;
   /**
-   * (DEPRECATED) Please use 'controlPlaneCount' instead. Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster
+   * Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster
    * over multiple master nodes whereas 'None' installs a full cluster over one node.
    *
    */
@@ -497,10 +492,6 @@ export interface ClusterCreateParams {
    * A comma-separated list of tags that are associated to the cluster.
    */
   tags?: string;
-  /**
-   * Specifies the required number of control plane nodes that should be part of the cluster.
-   */
-  controlPlaneCount?: number;
 }
 export interface ClusterDefaultConfig {
   clusterNetworkCidr?: string; // ^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[\/]([1-9]|[1-2][0-9]|3[0-2]?)$
@@ -620,16 +611,14 @@ export type ClusterValidationId =
   | 'lvm-requirements-satisfied'
   | 'mce-requirements-satisfied'
   | 'mtv-requirements-satisfied'
-  | 'osc-requirements-satisfied'
   | 'network-type-valid'
   | 'platform-requirements-satisfied'
   | 'node-feature-discovery-requirements-satisfied'
   | 'nvidia-gpu-requirements-satisfied'
   | 'pipelines-requirements-satisfied'
   | 'servicemesh-requirements-satisfied'
   | 'serverless-requirements-satisfied'
-  | 'openshift-ai-requirements-satisfied'
-  | 'authorino-requirements-satisfied';
+  | 'openshift-ai-requirements-satisfied';
 export interface CompletionParams {
   isSuccess: boolean;
   errorInfo?: string;
@@ -654,7 +643,6 @@ export interface ConnectivityRemoteHost {
   hostId?: string; // uuid
   l2Connectivity?: L2Connectivity[];
   l3Connectivity?: L3Connectivity[];
-  mtuReport?: MtuReport[];
 }
 export interface ConnectivityReport {
   remoteHosts?: ConnectivityRemoteHost[];
@@ -996,7 +984,6 @@ export type FeatureSupportLevelId =
   | 'CNV'
   | 'MCE'
   | 'MTV'
-  | 'OSC'
   | 'NUTANIX_INTEGRATION'
   | 'BAREMETAL_PLATFORM'
   | 'NONE_PLATFORM'
@@ -1018,9 +1005,7 @@ export type FeatureSupportLevelId =
   | 'PIPELINES'
   | 'SERVICEMESH'
   | 'SERVERLESS'
-  | 'OPENSHIFT_AI'
-  | 'NON_STANDARD_HA_CONTROL_PLANE'
-  | 'AUTHORINO';
+  | 'OPENSHIFT_AI';
 /**
  * Cluster finalizing stage managed by controller
  */
@@ -1546,7 +1531,6 @@ export type HostValidationId =
   | 'lvm-requirements-satisfied'
   | 'mce-requirements-satisfied'
   | 'mtv-requirements-satisfied'
-  | 'osc-requirements-satisfied'
   | 'sufficient-installation-disk-speed'
   | 'cnv-requirements-satisfied'
   | 'sufficient-network-latency-requirement-for-role'
@@ -1571,9 +1555,7 @@ export type HostValidationId =
   | 'pipelines-requirements-satisfied'
   | 'servicemesh-requirements-satisfied'
   | 'serverless-requirements-satisfied'
-  | 'openshift-ai-requirements-satisfied'
-  | 'authorino-requirements-satisfied'
-  | 'mtu-valid';
+  | 'openshift-ai-requirements-satisfied';
 /**
  * Explicit ignition endpoint overrides the default ignition endpoint.
  */
@@ -2149,11 +2131,6 @@ export interface MonitoredOperator {
   statusUpdatedAt?: string; // date-time
 }
 export type MonitoredOperatorsList = MonitoredOperator[];
-export interface MtuReport {
-  outgoingNic?: string;
-  remoteIpAddress?: string;
-  mtuSuccessful?: boolean;
-}
 export interface NextStepCmdRequest {
   /**
    * Infra env id
@@ -2454,7 +2431,6 @@ export interface Route {
    */
   metric?: number; // int32
 }
-export type SecureBootState = 'Unknown' | 'NotSupported' | 'Enabled' | 'Disabled';
 /**
  * IP address block for service IP blocks.
  */
@@ -2744,10 +2720,6 @@ export interface V2ClusterUpdateParams {
    * A comma-separated list of tags that are associated to the cluster.
    */
   tags?: string;
-  /**
-   * Specifies the required number of control plane nodes that should be part of the cluster.
-   */
-  controlPlaneCount?: number;
 }
 export interface V2Events {
   clusterId?: string;

libs/ui-lib-tests/cypress/fixtures/cluster/validation-info-host-discovery.ts

@@ -34,11 +34,6 @@ const operatorValidations = [
     status: 'success',
     message: 'openshift-ai is disabled',
   },
-  {
-    id: 'osc-requirements-satisfied',
-    status: 'success',
-    message: 'osc is disabled',
-  },
 ];
 
 const hostValidationsInfo = {
@@ -77,11 +72,6 @@ const hostValidationsInfo = {
       status: 'pending',
       message: 'Not enough information to calculate host majority groups',
     },
-    {
-      id: 'mtu-valid',
-      status: 'success',
-      message: '',
-    },
   ],
 };
 

libs/ui-lib-tests/cypress/fixtures/infra-envs/feature-support.ts

@@ -176,62 +176,6 @@ const featureSupportLevels = {
       VSPHERE_INTEGRATION: 'supported',
     },
   },
-  '4.18': {
-    features: {
-      BAREMETAL_PLATFORM: 'supported',
-      CLUSTER_MANAGED_NETWORKING: 'supported',
-      CNV: 'supported',
-      CUSTOM_MANIFEST: 'supported',
-      DUAL_STACK: 'supported',
-      DUAL_STACK_VIPS: 'supported',
-      EXTERNAL_PLATFORM: 'supported',
-      EXTERNAL_PLATFORM_OCI: 'tech-preview',
-      FULL_ISO: 'supported',
-      LSO: 'supported',
-      LVM: 'supported',
-      MCE: 'supported',
-      MINIMAL_ISO: 'supported',
-      NONE_PLATFORM: 'supported',
-      NUTANIX_INTEGRATION: 'supported',
-      ODF: 'supported',
-      OVN_NETWORK_TYPE: 'supported',
-      SDN_NETWORK_TYPE: 'unavailable',
-      SINGLE_NODE_EXPANSION: 'supported',
-      SKIP_MCO_REBOOT: 'supported',
-      SNO: 'supported',
-      USER_MANAGED_NETWORKING: 'supported',
-      VIP_AUTO_ALLOC: 'dev-preview',
-      VSPHERE_INTEGRATION: 'supported',
-    },
-  },
-  '4.18_s390x': {
-    features: {
-      BAREMETAL_PLATFORM: 'supported',
-      CLUSTER_MANAGED_NETWORKING: 'supported',
-      CNV: 'supported',
-      CUSTOM_MANIFEST: 'supported',
-      DUAL_STACK: 'supported',
-      DUAL_STACK_VIPS: 'supported',
-      EXTERNAL_PLATFORM: 'supported',
-      EXTERNAL_PLATFORM_OCI: 'tech-preview',
-      FULL_ISO: 'supported',
-      LSO: 'supported',
-      LVM: 'supported',
-      MCE: 'supported',
-      MINIMAL_ISO: 'supported',
-      NONE_PLATFORM: 'supported',
-      NUTANIX_INTEGRATION: 'supported',
-      ODF: 'supported',
-      OVN_NETWORK_TYPE: 'supported',
-      SDN_NETWORK_TYPE: 'unavailable',
-      SINGLE_NODE_EXPANSION: 'supported',
-      SKIP_MCO_REBOOT: 'supported',
-      SNO: 'supported',
-      USER_MANAGED_NETWORKING: 'supported',
-      VIP_AUTO_ALLOC: 'dev-preview',
-      VSPHERE_INTEGRATION: 'supported',
-    },
-  },
 };
 
 export { featureSupportLevels };

libs/ui-lib-tests/cypress/fixtures/infra-envs/openshift-versions.ts

@@ -47,11 +47,6 @@ const versions: Record<string, Version> = {
     display_name: 'OpenShift 4.15.2',
     support_level: 'production',
   },
-  '4.18': {
-    cpu_architectures: [x86, arm64, s390x, ppc64le],
-    display_name: 'OpenShift 4.18',
-    support_level: 'production',
-  },
 };
 
 expect(

libs/ui-lib-tests/cypress/integration/create-sno/0-create-cluster.cy.ts

@@ -31,10 +31,9 @@ describe(`Assisted Installer SNO Cluster Installation`, () => {
 
       clusterDetailsPage.inputClusterName();
       clusterDetailsPage.inputBaseDnsDomain();
-      clusterDetailsPage.inputOpenshiftVersion('4.18');
+      clusterDetailsPage.inputOpenshiftVersion();
 
-      clusterDetailsPage.openControlPlaneNodesDropdown();
-      clusterDetailsPage.selectControlPlaneNodeOption('1');
+      clusterDetailsPage.enableSno();
       clusterDetailsPage.inputPullSecret();
 
       // Create the cluster and store its ID when moving to the next step

libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/validations-new-cluster-page.cy.ts

@@ -48,7 +48,6 @@ describe('Create a new cluster and show correct validations for every field', ()
     const malformedJsonPullSecret = '{{}}';
     let pullSecretError =
       "Invalid pull secret format. You must use your Red Hat account's pull secret";
-    clusterDetailsPage.clearPullSecret();
     clusterDetailsPage.inputPullSecret(malformedJsonPullSecret);
     clusterDetailsPage.clickClusterDetailsBody();
     clusterDetailsPage.validateInputPullSecretFieldHelper(pullSecretError);
@@ -59,7 +58,6 @@ describe('Create a new cluster and show correct validations for every field', ()
     // Need to set valid name and DNS
     clusterDetailsPage.inputClusterName();
     clusterDetailsPage.inputBaseDnsDomain();
-    clusterDetailsPage.clearPullSecret();
     clusterDetailsPage.inputPullSecret(invalidPullSecret);
 
     const errorSuffix = Cypress.env('OCM_USER')

libs/ui-lib-tests/cypress/integration/use-cases/create-cluster/with-external-partner-integrations.cy.ts

@@ -100,16 +100,16 @@ describe('Create a new cluster with external partner integrations', () => {
     });
 
     it('Validate that Nutanix option is disabled when we choose SNO option', () => {
-      ClusterDetailsForm.openshiftVersionField.selectVersion('4.18');
-      ClusterDetailsForm.controlPlaneNodesField.selectControlPlaneNode('1');
+      ClusterDetailsForm.openshiftVersionField.selectVersion('4.14');
+      ClusterDetailsForm.snoField.findCheckbox().click();
       ClusterDetailsForm.externalPartnerIntegrationsField
         .findDropdownItem('Nutanix')
         .should('have.class', 'pf-m-aria-disabled');
     });
     it('Validate that all dropdown is disabled in case we choose IBM/Z(s390x) architecture + SNO', () => {
-      ClusterDetailsForm.openshiftVersionField.selectVersion('4.18');
-      ClusterDetailsForm.controlPlaneNodesField.selectControlPlaneNode('1');
+      ClusterDetailsForm.openshiftVersionField.selectVersion('4.14');
       ClusterDetailsForm.cpuArchitectureField.selectCpuArchitecture('s390x');
+      ClusterDetailsForm.snoField.findCheckbox().click();
       ClusterDetailsForm.externalPartnerIntegrationsField
         .findDropdownToggle()
         .should('be.disabled');

libs/ui-lib-tests/cypress/support/variables/cluster-details.ts

@@ -24,4 +24,3 @@ Cypress.env(
 );
 Cypress.env('baseDnsDomainFieldHelperErrorId', '#form-input-baseDnsDomain-field-helper-error');
 Cypress.env('pullSecretFieldHelperErrorId', '#form-input-pullSecret-field-helper-error');
-Cypress.env('controlPlaneNodesFieldId', '#form-input-controlPlaneCount-field');

libs/ui-lib-tests/cypress/views/clusterDetails.ts

@@ -58,6 +58,13 @@ export const clusterDetailsPage = {
   inputBaseDnsDomain: (dns = Cypress.env('DNS_DOMAIN_NAME')) => {
     clusterDetailsPage.getBaseDnsDomain().clear().type(dns).should('have.value', dns);
   },
+  getSno: () => {
+    return cy.get(Cypress.env('highAvailabilityModeFieldId'));
+  },
+  enableSno: () => {
+    clusterDetailsPage.getSno().scrollIntoView().should('be.visible').check();
+    clusterDetailsPage.getSno().should('be.checked');
+  },
   getStaticIpNetworkConfig: () => {
     return cy.get(Cypress.env('staticIpNetworkConfigFieldId'));
   },
@@ -136,13 +143,4 @@ export const clusterDetailsPage = {
   validateInputPullSecretFieldHelper: (msg) => {
     cy.get(Cypress.env('pullSecretFieldHelperErrorId')).should('contain', msg);
   },
-  openControlPlaneNodesDropdown: () => {
-    cy.get(`${Cypress.env('controlPlaneNodesFieldId')} > button.pf-v5-c-dropdown__toggle`).click();
-  },
-  selectControlPlaneNodeOption: (controlPlaneCount) => {
-    cy.get(`ul.pf-v5-c-dropdown__menu li[id=${controlPlaneCount}] a`).click();
-    cy.get(`${Cypress.env('controlPlaneNodesFieldId')} .pf-v5-c-dropdown__toggle-text`)
-      .invoke('text')
-      .should('match', new RegExp(controlPlaneCount, 'i'));
-  },
 };

libs/ui-lib-tests/cypress/views/forms/ClusterDetails/ClusterDetailsForm.ts

@@ -7,7 +7,6 @@ import { OpenShiftVersionField } from './Fields/OpenShiftVersionField';
 import { PullSecretField } from './Fields/PullSecretField';
 import { CpuArchitectureField } from './Fields/CpuArchitectureField';
 import { SnoField } from './Fields/SnoField';
-import { ControlPlaneNodesField } from './Fields/ControlPlaneNodesField';
 
 export class ClusterDetailsForm {
   static readonly alias = `@${ClusterDetailsForm.name}`;
@@ -53,8 +52,4 @@ export class ClusterDetailsForm {
   static get snoField() {
     return SnoField.init(ClusterDetailsForm.alias);
   }
-
-  static get controlPlaneNodesField() {
-    return ControlPlaneNodesField.init(ClusterDetailsForm.alias);
-  }
 }