diff --git a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProvider.tsx b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProvider.tsx index 0188fee66d..74a17bf117 100644 --- a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProvider.tsx +++ b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProvider.tsx @@ -8,7 +8,6 @@ import { } from 'MAPI/types'; import { extractErrorMessage } from 'MAPI/utils'; import { GenericResponseError } from 'model/clients/GenericResponseError'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capgv1beta1 from 'model/services/mapi/capgv1beta1'; import * as capzv1beta1 from 'model/services/mapi/capzv1beta1'; @@ -117,11 +116,11 @@ const ClusterDetailWidgetProvider: React.FC< > {isLoading ? ( - ) : kind === capav1beta1.AWSCluster ? ( + ) : kind === capav1beta2.AWSCluster ? ( ) : kind === capav1beta2.AWSManagedCluster ? ( diff --git a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProviderAWS.tsx b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProviderAWS.tsx index dd25468943..c5165ebbb7 100644 --- a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProviderAWS.tsx +++ b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProviderAWS.tsx @@ -1,7 +1,7 @@ import { Text } from 'grommet'; import { normalizeColor } from 'grommet/utils'; import { getProviderClusterLocation } from 'MAPI/utils'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as infrav1alpha3 from 'model/services/mapi/infrastructurev1alpha3'; import * as legacyCredentials from 'model/services/mapi/legacy/credentials'; import React from 'react'; @@ -20,9 +20,9 @@ const StyledLink = styled.a` `; interface IClusterDetailWidgetProviderAWSProps { - providerCluster: capav1beta1.IAWSCluster | infrav1alpha3.IAWSCluster; + providerCluster: capav1beta2.IAWSCluster | infrav1alpha3.IAWSCluster; providerCredential?: - | capav1beta1.IAWSClusterRoleIdentity + | capav1beta2.IAWSClusterRoleIdentity | legacyCredentials.ICredential; } diff --git a/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetControlPlaneNodes.tsx b/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetControlPlaneNodes.tsx index 90ee4d6602..9eacd91008 100644 --- a/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetControlPlaneNodes.tsx +++ b/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetControlPlaneNodes.tsx @@ -4,8 +4,8 @@ import { Providers, StatusCodes } from 'model/constants'; import nock from 'nock'; import React from 'react'; import { SWRConfig } from 'swr'; -import * as capa1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; -import * as capg1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; +import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; import * as capzv1beta1Mocks from 'test/mockHttpCalls/capzv1beta1'; import * as infrav1alpha3Mocks from 'test/mockHttpCalls/infrastructurev1alpha3'; @@ -311,7 +311,7 @@ describe('ClusterDetailWidgetControlPlaneNodes on GCP', () => { ) .reply( StatusCodes.Ok, - capg1beta1Mocks.randomClusterGCP1GCPMachineTemplateListCP + capgv1beta1Mocks.randomClusterGCP1GCPMachineTemplateListCP ); render( @@ -337,7 +337,7 @@ describe('ClusterDetailWidgetControlPlaneNodes on GCP', () => { ) .reply( StatusCodes.Ok, - capg1beta1Mocks.randomClusterGCP1GCPMachineTemplateListCP + capgv1beta1Mocks.randomClusterGCP1GCPMachineTemplateListCP ); render( @@ -379,7 +379,7 @@ describe('ClusterDetailWidgetControlPlaneNodes on CAPA', () => { ) .reply( StatusCodes.Ok, - capa1beta1Mocks.randomClusterCAPA1AWSMachineTemplateList + capav1beta2Mocks.randomClusterCAPA1AWSMachineTemplateList ); render( @@ -405,7 +405,7 @@ describe('ClusterDetailWidgetControlPlaneNodes on CAPA', () => { ) .reply( StatusCodes.Ok, - capa1beta1Mocks.randomClusterCAPA1AWSMachineTemplateList + capav1beta2Mocks.randomClusterCAPA1AWSMachineTemplateList ); render( diff --git a/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetProvider.tsx b/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetProvider.tsx index a91ff0e7d7..e8120ee9f2 100644 --- a/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetProvider.tsx +++ b/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetProvider.tsx @@ -18,7 +18,7 @@ import nock from 'nock'; import React from 'react'; import { useParams } from 'react-router'; import { SWRConfig } from 'swr'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; import * as capzv1beta1Mocks from 'test/mockHttpCalls/capzv1beta1'; @@ -166,7 +166,7 @@ async function setupGCP() { async function setupCAPA() { const utils = setup( capiv1beta1Mocks.randomClusterCAPA1, - capav1beta1Mocks.randomAWSCluster1 + capav1beta2Mocks.randomAWSCluster1 ); if (screen.queryAllByText('Loading...').length > 0) { @@ -449,7 +449,7 @@ describe('ClusterDetailWidgetProvider when user can get AWSClusterRoleIdentity o .get( '/apis/infrastructure.cluster.x-k8s.io/v1beta1/awsclusterroleidentities/default/' ) - .reply(StatusCodes.Ok, capav1beta1Mocks.defaultAWSClusterRoleIdentity); + .reply(StatusCodes.Ok, capav1beta2Mocks.defaultAWSClusterRoleIdentity); await setupCAPA(); const providerInfo = screen.getByTestId('provider-info'); expect(within(providerInfo).getByText('AWS region')).toBeInTheDocument(); diff --git a/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetVersions.tsx b/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetVersions.tsx index 95e09e605b..d16fdb0e4d 100644 --- a/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetVersions.tsx +++ b/src/components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetVersions.tsx @@ -5,7 +5,7 @@ import { Providers, StatusCodes } from 'model/constants'; import nock from 'nock'; import React from 'react'; import { SWRConfig } from 'swr'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; import * as capzv1beta1Mocks from 'test/mockHttpCalls/capzv1beta1'; @@ -166,7 +166,7 @@ describe('ClusterDetailWidgetVersions on CAPA', () => { render( getComponent({ cluster: capiv1beta1Mocks.randomClusterCAPA1, - providerCluster: capav1beta1Mocks.randomAWSCluster1, + providerCluster: capav1beta2Mocks.randomAWSCluster1, }) ); @@ -179,7 +179,7 @@ describe('ClusterDetailWidgetVersions on CAPA', () => { render( getComponent({ cluster: capiv1beta1Mocks.randomClusterCAPA1, - providerCluster: capav1beta1Mocks.randomAWSCluster1, + providerCluster: capav1beta2Mocks.randomAWSCluster1, }) ); diff --git a/src/components/MAPI/clusters/ClusterDetail/__tests__/index.tsx b/src/components/MAPI/clusters/ClusterDetail/__tests__/index.tsx index 897e4e5ca8..02769f3f81 100644 --- a/src/components/MAPI/clusters/ClusterDetail/__tests__/index.tsx +++ b/src/components/MAPI/clusters/ClusterDetail/__tests__/index.tsx @@ -13,7 +13,7 @@ import nock from 'nock'; import React from 'react'; import { useRouteMatch } from 'react-router'; import { SWRConfig } from 'swr'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; import * as capzv1beta1Mocks from 'test/mockHttpCalls/capzv1beta1'; @@ -447,7 +447,7 @@ describe('ClusterDetail', () => { ], }, }; - const providerCluster = capav1beta1Mocks.randomAWSCluster1; + const providerCluster = capav1beta2Mocks.randomAWSCluster1; (useRouteMatch as jest.Mock).mockReturnValue( getRouteMatch(cluster.metadata.name) diff --git a/src/components/MAPI/clusters/ClusterDetail/utils.ts b/src/components/MAPI/clusters/ClusterDetail/utils.ts index 1f4b69ec0b..f1975735f2 100644 --- a/src/components/MAPI/clusters/ClusterDetail/utils.ts +++ b/src/components/MAPI/clusters/ClusterDetail/utils.ts @@ -18,7 +18,6 @@ import { import { GenericResponseError } from 'model/clients/GenericResponseError'; import { IHttpClient } from 'model/clients/HttpClient'; import { Constants, Providers } from 'model/constants'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capgv1beta1 from 'model/services/mapi/capgv1beta1'; import * as capiv1beta1 from 'model/services/mapi/capiv1beta1'; @@ -334,16 +333,16 @@ export async function fetchProviderCredential( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && - apiGroup === capav1beta1.ApiGroup: { - const identityRef = (providerCluster as capav1beta1.IAWSCluster).spec + case kind === capav1beta2.AWSCluster && + apiGroup === capav1beta2.ApiGroup: { + const identityRef = (providerCluster as capav1beta2.IAWSCluster).spec ?.identityRef; if (identityRef?.kind !== 'AWSClusterRoleIdentity') { throw new Error('Unsupported AWS cluster role identity reference.'); } - return capav1beta1.getAWSClusterRoleIdentity( + return capav1beta2.getAWSClusterRoleIdentity( httpClientFactory(), auth, identityRef.name @@ -427,15 +426,15 @@ export function fetchProviderCredentialKey( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: { - const identityRef = (providerCluster as capav1beta1.IAWSCluster).spec + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: { + const identityRef = (providerCluster as capav1beta2.IAWSCluster).spec ?.identityRef; if (identityRef?.kind !== 'AWSClusterRoleIdentity') { return null; } - return capav1beta1.getAWSClusterRoleIdentityKey(identityRef.name); + return capav1beta2.getAWSClusterRoleIdentityKey(identityRef.name); } case kind === capav1beta2.AWSManagedCluster && @@ -492,17 +491,16 @@ function getMainCredential(credentials: legacyCredentials.ICredential[]) { export function getAWSCredentialAccountID( credential?: | legacyCredentials.ICredential - | capav1beta1.IAWSClusterRoleIdentity | capav1beta2.IAWSClusterRoleIdentity ) { if (!credential) return ''; switch (true) { case credential.hasOwnProperty('kind') && - (credential as capav1beta1.IAWSClusterRoleIdentity).kind === + (credential as capav1beta2.IAWSClusterRoleIdentity).kind === 'AWSClusterRoleIdentity': return extractIDFromARN( - (credential as capav1beta1.IAWSClusterRoleIdentity).spec?.roleARN + (credential as capav1beta2.IAWSClusterRoleIdentity).spec?.roleARN ); case credential.hasOwnProperty('awsOperatorRole'): return (credential as legacyCredentials.ICredential).awsOperatorRole; diff --git a/src/components/MAPI/clusters/ClusterList/__tests__/ClusterListItem.tsx b/src/components/MAPI/clusters/ClusterList/__tests__/ClusterListItem.tsx index bcbe2b9088..8352590d8f 100644 --- a/src/components/MAPI/clusters/ClusterList/__tests__/ClusterListItem.tsx +++ b/src/components/MAPI/clusters/ClusterList/__tests__/ClusterListItem.tsx @@ -11,7 +11,7 @@ import nock from 'nock'; import React from 'react'; import { SWRConfig } from 'swr'; import { withMarkup } from 'test/assertUtils'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiexpv1alpha3Mocks from 'test/mockHttpCalls/capiv1alpha3/exp'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; @@ -745,7 +745,7 @@ describe('ClusterListItem on CAPA', () => { render( getComponent({ cluster: capiv1beta1Mocks.randomClusterCAPA1, - providerCluster: capav1beta1Mocks.randomAWSCluster1, + providerCluster: capav1beta2Mocks.randomAWSCluster1, }) ); @@ -774,7 +774,7 @@ describe('ClusterListItem on CAPA', () => { ], }, }, - providerCluster: capav1beta1Mocks.randomAWSCluster1, + providerCluster: capav1beta2Mocks.randomAWSCluster1, }) ); diff --git a/src/components/MAPI/organizations/OrganizationDetailGeneral/__tests__/index.tsx b/src/components/MAPI/organizations/OrganizationDetailGeneral/__tests__/index.tsx index f175f7b2cd..aa631a6c92 100644 --- a/src/components/MAPI/organizations/OrganizationDetailGeneral/__tests__/index.tsx +++ b/src/components/MAPI/organizations/OrganizationDetailGeneral/__tests__/index.tsx @@ -17,7 +17,7 @@ import nock from 'nock'; import * as React from 'react'; import { SWRConfig } from 'swr'; import * as authorizationv1Mocks from 'test/mockHttpCalls/authorizationv1'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiexpv1alpha3Mocks from 'test/mockHttpCalls/capiv1alpha3/exp'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; @@ -966,13 +966,13 @@ describe('OrganizationDetailGeneral on CAPA', () => { .get( `/apis/infrastructure.cluster.x-k8s.io/v1beta1/namespaces/org-org1/awsclusters/${capiv1beta1Mocks.randomClusterListCAPA.items[0].metadata.name}/` ) - .reply(StatusCodes.Ok, capav1beta1Mocks.randomAWSCluster1); + .reply(StatusCodes.Ok, capav1beta2Mocks.randomAWSCluster1); nock(window.config.mapiEndpoint) .get( `/apis/infrastructure.cluster.x-k8s.io/v1beta1/namespaces/org-org1/awsclusters/${capiv1beta1Mocks.randomClusterListCAPA.items[1].metadata.name}/` ) - .reply(StatusCodes.Ok, capav1beta1Mocks.randomAWSCluster2); + .reply(StatusCodes.Ok, capav1beta2Mocks.randomAWSCluster2); nock(window.config.mapiEndpoint) .get( @@ -987,7 +987,7 @@ describe('OrganizationDetailGeneral on CAPA', () => { .get( `/apis/infrastructure.cluster.x-k8s.io/v1beta1/namespaces/org-org1/awsmachinepools/${capiv1beta1Mocks.randomClusterCAPA1MachinePoolList.items[0].spec?.template.spec?.infrastructureRef.name}/` ) - .reply(StatusCodes.Ok, capav1beta1Mocks.randomClusterCAPA1AWSMachinePool); + .reply(StatusCodes.Ok, capav1beta2Mocks.randomClusterCAPA1AWSMachinePool); render( getComponent({ diff --git a/src/components/MAPI/organizations/OrganizationDetailGeneral/utils.ts b/src/components/MAPI/organizations/OrganizationDetailGeneral/utils.ts index 7eee11a32e..211b21052f 100644 --- a/src/components/MAPI/organizations/OrganizationDetailGeneral/utils.ts +++ b/src/components/MAPI/organizations/OrganizationDetailGeneral/utils.ts @@ -21,7 +21,7 @@ import { mapNodePoolsToProviderNodePools, } from 'MAPI/workernodes/utils'; import { GenericResponse } from 'model/clients/GenericResponse'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capgv1beta1 from 'model/services/mapi/capgv1beta1'; import * as capiv1beta1 from 'model/services/mapi/capiv1beta1'; import * as capzv1beta1 from 'model/services/mapi/capzv1beta1'; @@ -152,7 +152,7 @@ function appendControlPlaneNodeStats( for (const cpNode of controlPlaneNodes) { switch (cpNode.kind) { - case capav1beta1.AWSMachineTemplate: + case capav1beta2.AWSMachineTemplate: case capgv1beta1.GCPMachineTemplate: if (cpNode.spec?.template?.spec.instanceType) { instanceTypes.push(cpNode.spec.template.spec.instanceType); diff --git a/src/components/MAPI/types.ts b/src/components/MAPI/types.ts index 139700dff5..9a7013d590 100644 --- a/src/components/MAPI/types.ts +++ b/src/components/MAPI/types.ts @@ -1,4 +1,3 @@ -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capgv1beta1 from 'model/services/mapi/capgv1beta1'; import * as capiexpv1alpha3 from 'model/services/mapi/capiv1alpha3/exp'; @@ -12,7 +11,7 @@ import * as legacyCredentials from 'model/services/mapi/legacy/credentials'; export type ControlPlane = capiv1beta1.IKubeadmControlPlane | undefined; export type ControlPlaneNode = - | capav1beta1.IAWSMachineTemplate + | capav1beta2.IAWSMachineTemplate | capav1beta2.IAWSManagedControlPlane | capgv1beta1.IGCPMachineTemplate | capiv1beta1.IMachine @@ -25,7 +24,7 @@ export type ControlPlaneNodeList = | capzv1beta1.IAzureMachineList | infrav1alpha3.IAWSControlPlaneList | infrav1alpha3.IG8sControlPlaneList - | capav1beta1.IAWSMachineTemplateList + | capav1beta2.IAWSMachineTemplateList | capav1beta2.IAWSManagedControlPlaneList | capgv1beta1.IGCPMachineTemplateList | capiv1beta1.IMachineList; @@ -37,7 +36,7 @@ export type ClusterList = capiv1beta1.IClusterList; export type ProviderCluster = | capzv1beta1.IAzureCluster | infrav1alpha3.IAWSCluster - | capav1beta1.IAWSCluster + | capav1beta2.IAWSCluster | capav1beta2.IAWSManagedCluster | capgv1beta1.IGCPCluster | undefined; @@ -45,7 +44,7 @@ export type ProviderCluster = export type ProviderClusterList = | capzv1beta1.IAzureClusterList | infrav1alpha3.IAWSClusterList - | capav1beta1.IAWSClusterList + | capav1beta2.IAWSClusterList | capav1beta2.IAWSManagedClusterList | capgv1beta1.IGCPClusterList; @@ -60,7 +59,7 @@ export type NodePoolList = | capiv1beta1.IMachinePoolList; export type ProviderNodePool = - | capav1beta1.IAWSMachinePool + | capav1beta2.IAWSMachinePool | capav1beta2.IAWSManagedMachinePool | capgv1beta1.IGCPMachineTemplate | capzv1beta1.IAzureMachineTemplate @@ -73,20 +72,18 @@ export type ProviderNodePoolList = | capzexpv1alpha3.IAzureMachinePoolList | capzv1beta1.IAzureMachinePoolList | infrav1alpha3.IAWSMachineDeploymentList - | capav1beta1.IAWSMachinePoolList + | capav1beta2.IAWSMachinePoolList | capav1beta2.IAWSManagedMachinePoolList | capgv1beta1.IGCPMachineTemplateList; export type ProviderCredential = | legacyCredentials.ICredential - | capav1beta1.IAWSClusterRoleIdentity | capav1beta2.IAWSClusterRoleIdentity | capzv1beta1.IAzureClusterIdentity | undefined; export type ProviderCredentialList = | legacyCredentials.ICredentialList - | capav1beta1.IAWSClusterRoleIdentityList | capav1beta2.IAWSClusterRoleIdentityList | capzv1beta1.IAzureClusterIdentityList; diff --git a/src/components/MAPI/utils.ts b/src/components/MAPI/utils.ts index bdcfa55f21..5ab3d67783 100644 --- a/src/components/MAPI/utils.ts +++ b/src/components/MAPI/utils.ts @@ -1,7 +1,6 @@ import { GenericResponse } from 'model/clients/GenericResponse'; import { Constants, ProviderFlavors, Providers } from 'model/constants'; import * as applicationv1alpha1 from 'model/services/mapi/applicationv1alpha1'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capgv1beta1 from 'model/services/mapi/capgv1beta1'; import * as capiexpv1alpha3 from 'model/services/mapi/capiv1alpha3/exp'; @@ -200,7 +199,7 @@ export async function fetchNodePoolListForCluster( break; - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: case kind === capav1beta2.AWSManagedCluster && apiGroup === capav1beta2.ApiGroup: case kind === capzv1beta1.AzureCluster: @@ -290,7 +289,7 @@ export function fetchNodePoolListForClusterKey( namespace, }); - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: case kind === capav1beta2.AWSManagedCluster && apiGroup === capav1beta2.ApiGroup: case kind === capzv1beta1.AzureCluster: @@ -335,8 +334,8 @@ export async function fetchProviderNodePoolForNodePool( const kind = infrastructureRef.kind; switch (true) { - case kind === capav1beta1.AWSMachinePool: - return capav1beta1.getAWSMachinePool( + case kind === capav1beta2.AWSMachinePool: + return capav1beta2.getAWSMachinePool( httpClientFactory(), auth, nodePool.metadata.namespace!, @@ -643,9 +642,9 @@ export async function fetchControlPlaneNodesForCluster( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: { + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: { const [capaCP, machineCP] = await Promise.allSettled([ - capav1beta1.getAWSMachineTemplateList(httpClientFactory(), auth, { + capav1beta2.getAWSMachineTemplateList(httpClientFactory(), auth, { labelSelector: { matchingLabels: { [capiv1beta1.labelClusterName]: cluster.metadata.name, @@ -902,8 +901,8 @@ export function fetchControlPlaneNodesForClusterKey( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: - return capav1beta1.getAWSMachineTemplateListKey({ + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: + return capav1beta2.getAWSMachineTemplateListKey({ labelSelector: { matchingLabels: { [capiv1beta1.labelClusterName]: cluster.metadata.name, @@ -988,8 +987,8 @@ export async function fetchProviderClusterForCluster( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: - return capav1beta1.getAWSCluster( + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: + return capav1beta2.getAWSCluster( httpClientFactory(), auth, cluster.metadata.namespace!, @@ -1043,8 +1042,8 @@ export function fetchProviderClusterForClusterKey(cluster: Cluster) { const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: - return capav1beta1.getAWSClusterKey( + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: + return capav1beta2.getAWSClusterKey( cluster.metadata.namespace!, infrastructureRef.name ); @@ -1186,7 +1185,7 @@ export function getProviderNodePoolMachineTypes( providerNodePool: ProviderNodePool ): NodePoolMachineTypes | undefined { switch (providerNodePool?.kind) { - case capav1beta1.AWSMachinePool: + case capav1beta2.AWSMachinePool: return { primary: providerNodePool.spec?.awsLaunchTemplate.instanceType ?? '', }; @@ -1250,7 +1249,7 @@ export function getProviderNodePoolSpotInstances( providerNodePool: ProviderNodePool ): NodePoolSpotInstances | undefined { switch (providerNodePool?.kind) { - case capav1beta1.AWSMachinePool: { + case capav1beta2.AWSMachinePool: { const onDemandBaseCapacity = providerNodePool.spec?.mixedInstancesPolicy?.instancesDistribution ?.onDemandBaseCapacity ?? 0; @@ -1375,11 +1374,11 @@ export function getNodePoolScaling( switch (true) { // CAPA case kind === capiv1beta1.MachinePool && - providerNodePoolKind === capav1beta1.AWSMachinePool: { + providerNodePoolKind === capav1beta2.AWSMachinePool: { status.min = - (providerNodePool as capav1beta1.IAWSMachinePool).spec?.minSize ?? -1; + (providerNodePool as capav1beta2.IAWSMachinePool).spec?.minSize ?? -1; status.max = - (providerNodePool as capav1beta1.IAWSMachinePool).spec?.maxSize ?? -1; + (providerNodePool as capav1beta2.IAWSMachinePool).spec?.maxSize ?? -1; return status; } @@ -1440,9 +1439,9 @@ export function getNodePoolAvailabilityZones( switch (true) { // CAPA case kind === capiv1beta1.MachinePool && - providerNodePoolKind === capav1beta1.AWSMachinePool: + providerNodePoolKind === capav1beta2.AWSMachinePool: return ( - (providerNodePool as capav1beta1.IAWSMachinePool).spec + (providerNodePool as capav1beta2.IAWSMachinePool).spec ?.availabilityZones ?? [] ); @@ -1541,8 +1540,8 @@ export function getProviderClusterLocation( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: - return (providerCluster as capav1beta1.IAWSCluster).spec?.region ?? ''; + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: + return (providerCluster as capav1beta2.IAWSCluster).spec?.region ?? ''; case kind === capgv1beta1.GCPCluster: return providerCluster.spec?.region ?? ''; diff --git a/src/components/MAPI/workernodes/ClusterDetailWorkerNodes.tsx b/src/components/MAPI/workernodes/ClusterDetailWorkerNodes.tsx index d6293c8a95..5a2d7fa106 100644 --- a/src/components/MAPI/workernodes/ClusterDetailWorkerNodes.tsx +++ b/src/components/MAPI/workernodes/ClusterDetailWorkerNodes.tsx @@ -25,7 +25,7 @@ import { } from 'MAPI/utils'; import { GenericResponseError } from 'model/clients/GenericResponseError'; import { ProviderFlavors, Providers } from 'model/constants'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capiv1beta1 from 'model/services/mapi/capiv1beta1'; import * as capzexpv1alpha3 from 'model/services/mapi/capzv1alpha3/exp'; import * as capzv1beta1 from 'model/services/mapi/capzv1beta1'; @@ -78,7 +78,7 @@ export function getAdditionalColumns( const apiGroup = getApiGroupFromApiVersion(apiVersion); switch (true) { - case kind === capav1beta1.AWSCluster && apiGroup === capav1beta1.ApiGroup: + case kind === capav1beta2.AWSCluster && apiGroup === capav1beta2.ApiGroup: return [ { title: 'Spot instances', @@ -86,7 +86,7 @@ export function getAdditionalColumns( return ( ); diff --git a/src/components/MAPI/workernodes/WorkerNodesNodePoolItemMachineType.tsx b/src/components/MAPI/workernodes/WorkerNodesNodePoolItemMachineType.tsx index 9755e4be6e..5bb53f3c1b 100644 --- a/src/components/MAPI/workernodes/WorkerNodesNodePoolItemMachineType.tsx +++ b/src/components/MAPI/workernodes/WorkerNodesNodePoolItemMachineType.tsx @@ -5,7 +5,6 @@ import { getProviderNodePoolMachineTypes, INodePoolMachineTypesAWS, } from 'MAPI/utils'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import * as capgv1beta1 from 'model/services/mapi/capgv1beta1'; import * as capzexpv1alpha3 from 'model/services/mapi/capzv1alpha3/exp'; @@ -32,7 +31,7 @@ function formatMachineTypeLabel(providerNodePool?: ProviderNodePool) { case capzv1beta1.AzureMachineTemplate: return `VM size: ${machineTypes?.primary ?? 'n/a'}`; - case capav1beta1.AWSMachinePool: + case capav1beta2.AWSMachinePool: case capav1beta2.AWSManagedMachinePool: case capgv1beta1.GCPMachineTemplate: case infrav1alpha3.AWSMachineDeployment: diff --git a/src/components/MAPI/workernodes/WorkerNodesSpotInstancesCAPA.tsx b/src/components/MAPI/workernodes/WorkerNodesSpotInstancesCAPA.tsx index 61c7eaaed4..0f2ab53c72 100644 --- a/src/components/MAPI/workernodes/WorkerNodesSpotInstancesCAPA.tsx +++ b/src/components/MAPI/workernodes/WorkerNodesSpotInstancesCAPA.tsx @@ -3,14 +3,14 @@ import { getProviderNodePoolSpotInstances, INodePoolSpotInstancesCAPA, } from 'MAPI/utils'; -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; import React from 'react'; import NotAvailable from 'UI/Display/NotAvailable'; import OptionalValue from 'UI/Display/OptionalValue/OptionalValue'; import { Tooltip, TooltipContainer } from 'UI/Display/Tooltip'; interface IWorkerNodesSpotInstancesCAPAProps { - providerNodePool?: capav1beta1.IAWSMachinePool; + providerNodePool?: capav1beta2.IAWSMachinePool; } const WorkerNodesSpotInstancesCAPA: React.FC< diff --git a/src/components/MAPI/workernodes/__tests__/ClusterDetailWidgetWorkerNodes.tsx b/src/components/MAPI/workernodes/__tests__/ClusterDetailWidgetWorkerNodes.tsx index f2f9812875..585ed519f2 100644 --- a/src/components/MAPI/workernodes/__tests__/ClusterDetailWidgetWorkerNodes.tsx +++ b/src/components/MAPI/workernodes/__tests__/ClusterDetailWidgetWorkerNodes.tsx @@ -6,7 +6,7 @@ import * as metav1 from 'model/services/mapi/metav1'; import nock from 'nock'; import React from 'react'; import { SWRConfig } from 'swr'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiexpv1alpha3Mocks from 'test/mockHttpCalls/capiv1alpha3/exp'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; @@ -511,7 +511,7 @@ describe('ClusterDetailWidgetWorkerNodes on CAPA', () => { .get( `/apis/infrastructure.cluster.x-k8s.io/v1beta1/namespaces/org-org1/awsmachinepools/${capiv1beta1Mocks.randomClusterCAPA1MachinePoolList.items[0].spec?.template.spec?.infrastructureRef.name}/` ) - .reply(StatusCodes.Ok, capav1beta1Mocks.randomClusterCAPA1AWSMachinePool); + .reply(StatusCodes.Ok, capav1beta2Mocks.randomClusterCAPA1AWSMachinePool); render( getComponent({ @@ -572,11 +572,11 @@ describe('ClusterDetailWidgetWorkerNodes on CAPA', () => { `/apis/infrastructure.cluster.x-k8s.io/v1beta1/namespaces/org-org1/awsmachinepools/${capiv1beta1Mocks.randomClusterCAPA1MachinePoolList.items[0].spec?.template.spec?.infrastructureRef.name}/` ) .reply(StatusCodes.Ok, { - ...capav1beta1Mocks.randomClusterCAPA1AWSMachinePool, + ...capav1beta2Mocks.randomClusterCAPA1AWSMachinePool, spec: { - ...capav1beta1Mocks.randomClusterCAPA1AWSMachinePool.spec, + ...capav1beta2Mocks.randomClusterCAPA1AWSMachinePool.spec, awsLaunchTemplate: { - ...capav1beta1Mocks.randomClusterCAPA1AWSMachinePool.spec! + ...capav1beta2Mocks.randomClusterCAPA1AWSMachinePool.spec! .awsLaunchTemplate, instanceType: 'random-instance-type', }, diff --git a/src/components/MAPI/workernodes/__tests__/ClusterDetailWorkerNodes.tsx b/src/components/MAPI/workernodes/__tests__/ClusterDetailWorkerNodes.tsx index a106c020ac..f081cc9be8 100644 --- a/src/components/MAPI/workernodes/__tests__/ClusterDetailWorkerNodes.tsx +++ b/src/components/MAPI/workernodes/__tests__/ClusterDetailWorkerNodes.tsx @@ -7,7 +7,7 @@ import nock from 'nock'; import React from 'react'; import Router from 'react-router'; import { SWRConfig } from 'swr'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiexpv1alpha3Mocks from 'test/mockHttpCalls/capiv1alpha3/exp'; import * as mockCapiv1beta1 from 'test/mockHttpCalls/capiv1beta1'; @@ -469,7 +469,7 @@ describe('ClusterDetailWorkerNodes on CAPA', () => { .get( `/apis/infrastructure.cluster.x-k8s.io/v1beta1/namespaces/org-org1/awsmachinepools/${mockCapiv1beta1.randomClusterCAPA1MachinePoolList.items[0].spec?.template.spec?.infrastructureRef.name}/` ) - .reply(StatusCodes.Ok, capav1beta1Mocks.randomClusterCAPA1AWSMachinePool); + .reply(StatusCodes.Ok, capav1beta2Mocks.randomClusterCAPA1AWSMachinePool); render(getComponent({})); diff --git a/src/components/MAPI/workernodes/__tests__/WorkerNodesNodePoolItem.tsx b/src/components/MAPI/workernodes/__tests__/WorkerNodesNodePoolItem.tsx index 688c59ef63..d7f72460e1 100644 --- a/src/components/MAPI/workernodes/__tests__/WorkerNodesNodePoolItem.tsx +++ b/src/components/MAPI/workernodes/__tests__/WorkerNodesNodePoolItem.tsx @@ -8,7 +8,7 @@ import nock from 'nock'; import React from 'react'; import { SWRConfig } from 'swr'; import { withMarkup } from 'test/assertUtils'; -import * as capav1beta1Mocks from 'test/mockHttpCalls/capav1beta1'; +import * as capav1beta2Mocks from 'test/mockHttpCalls/capav1beta2'; import * as capgv1beta1Mocks from 'test/mockHttpCalls/capgv1beta1'; import * as capiexpv1alpha3Mocks from 'test/mockHttpCalls/capiv1alpha3/exp'; import * as capiv1beta1Mocks from 'test/mockHttpCalls/capiv1beta1'; @@ -888,7 +888,7 @@ describe('WorkerNodesNodePoolItem on CAPA', () => { render( getComponent({ nodePool: capiv1beta1Mocks.randomClusterCAPA1MachinePool1, - providerNodePool: capav1beta1Mocks.randomClusterCAPA1AWSMachinePool, + providerNodePool: capav1beta2Mocks.randomClusterCAPA1AWSMachinePool, }) ); @@ -911,7 +911,7 @@ describe('WorkerNodesNodePoolItem on CAPA', () => { render( getComponent({ nodePool: capiv1beta1Mocks.randomClusterCAPA1MachinePool1, - providerNodePool: capav1beta1Mocks.randomClusterCAPA1AWSMachinePool, + providerNodePool: capav1beta2Mocks.randomClusterCAPA1AWSMachinePool, }) ); @@ -933,7 +933,7 @@ describe('WorkerNodesNodePoolItem on CAPA', () => { render( getComponent({ nodePool: capiv1beta1Mocks.randomClusterCAPA1MachinePool1, - providerNodePool: capav1beta1Mocks.randomClusterCAPA1AWSMachinePool, + providerNodePool: capav1beta2Mocks.randomClusterCAPA1AWSMachinePool, additionalColumns: getAdditionalColumns( capiv1beta1Mocks.randomClusterCAPA1 ), @@ -958,7 +958,7 @@ describe('WorkerNodesNodePoolItem on CAPA', () => { render( getComponent({ nodePool: capiv1beta1Mocks.randomClusterCAPA1MachinePool1, - providerNodePool: capav1beta1Mocks.randomClusterCAPA1AWSMachinePoolSpot, + providerNodePool: capav1beta2Mocks.randomClusterCAPA1AWSMachinePoolSpot, additionalColumns: getAdditionalColumns( capiv1beta1Mocks.randomClusterCAPA1 ), diff --git a/test/mockHttpCalls/capav1beta1/awsClusterRoleIdentities.ts b/test/mockHttpCalls/capav1beta2/awsClusterRoleIdentities.ts similarity index 70% rename from test/mockHttpCalls/capav1beta1/awsClusterRoleIdentities.ts rename to test/mockHttpCalls/capav1beta2/awsClusterRoleIdentities.ts index b36b9e1459..c9675694fc 100644 --- a/test/mockHttpCalls/capav1beta1/awsClusterRoleIdentities.ts +++ b/test/mockHttpCalls/capav1beta2/awsClusterRoleIdentities.ts @@ -1,8 +1,8 @@ -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; -export const defaultAWSClusterRoleIdentity: capav1beta1.IAWSClusterRoleIdentity = +export const defaultAWSClusterRoleIdentity: capav1beta2.IAWSClusterRoleIdentity = { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSClusterRoleIdentity', metadata: { creationTimestamp: '2022-09-29T09:14:00Z', diff --git a/test/mockHttpCalls/capav1beta1/awsClusters.ts b/test/mockHttpCalls/capav1beta2/awsClusters.ts similarity index 92% rename from test/mockHttpCalls/capav1beta1/awsClusters.ts rename to test/mockHttpCalls/capav1beta2/awsClusters.ts index eb06c86d83..e084b62f7e 100644 --- a/test/mockHttpCalls/capav1beta1/awsClusters.ts +++ b/test/mockHttpCalls/capav1beta2/awsClusters.ts @@ -1,7 +1,7 @@ -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; -export const randomAWSCluster1: capav1beta1.IAWSCluster = { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', +export const randomAWSCluster1: capav1beta2.IAWSCluster = { + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSCluster', metadata: { annotations: { @@ -74,8 +74,8 @@ export const randomAWSCluster1: capav1beta1.IAWSCluster = { }, }; -export const randomAWSCluster2: capav1beta1.IAWSCluster = { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', +export const randomAWSCluster2: capav1beta2.IAWSCluster = { + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSCluster', metadata: { annotations: { diff --git a/test/mockHttpCalls/capav1beta1/awsMachinePools.ts b/test/mockHttpCalls/capav1beta2/awsMachinePools.ts similarity index 95% rename from test/mockHttpCalls/capav1beta1/awsMachinePools.ts rename to test/mockHttpCalls/capav1beta2/awsMachinePools.ts index 0e8688cedf..0aad6a144f 100644 --- a/test/mockHttpCalls/capav1beta1/awsMachinePools.ts +++ b/test/mockHttpCalls/capav1beta2/awsMachinePools.ts @@ -1,7 +1,7 @@ -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; -export const randomClusterCAPA1AWSMachinePool: capav1beta1.IAWSMachinePool = { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', +export const randomClusterCAPA1AWSMachinePool: capav1beta2.IAWSMachinePool = { + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSMachinePool', metadata: { annotations: { @@ -109,9 +109,9 @@ export const randomClusterCAPA1AWSMachinePool: capav1beta1.IAWSMachinePool = { }, }; -export const randomClusterCAPA1AWSMachinePoolSpot: capav1beta1.IAWSMachinePool = +export const randomClusterCAPA1AWSMachinePoolSpot: capav1beta2.IAWSMachinePool = { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSMachinePool', metadata: { annotations: { diff --git a/test/mockHttpCalls/capav1beta1/awsMachineTemplates.ts b/test/mockHttpCalls/capav1beta2/awsMachineTemplates.ts similarity index 93% rename from test/mockHttpCalls/capav1beta1/awsMachineTemplates.ts rename to test/mockHttpCalls/capav1beta2/awsMachineTemplates.ts index 878e174526..62c4ea63e2 100644 --- a/test/mockHttpCalls/capav1beta1/awsMachineTemplates.ts +++ b/test/mockHttpCalls/capav1beta2/awsMachineTemplates.ts @@ -1,16 +1,16 @@ -import * as capav1beta1 from 'model/services/mapi/capav1beta1'; +import * as capav1beta2 from 'model/services/mapi/capav1beta2'; // AWSMachineTemplateList for randomClusterCAPA1's control plane -export const randomClusterCAPA1AWSMachineTemplateList: capav1beta1.IAWSMachineTemplateList = +export const randomClusterCAPA1AWSMachineTemplateList: capav1beta2.IAWSMachineTemplateList = { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSMachineTemplateList', metadata: { resourceVersion: '16032957', }, items: [ { - apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta1', + apiVersion: 'infrastructure.cluster.x-k8s.io/v1beta2', kind: 'AWSMachineTemplate', metadata: { annotations: { diff --git a/test/mockHttpCalls/capav1beta1/index.ts b/test/mockHttpCalls/capav1beta2/index.ts similarity index 100% rename from test/mockHttpCalls/capav1beta1/index.ts rename to test/mockHttpCalls/capav1beta2/index.ts