Add CAPV support (#4630)

giantswarm · Oct 15, 2024 · 336a567 · 336a567
1 parent 4e8db9c
commit 336a567
Show file tree

Hide file tree

Showing 27 changed files with 2,304 additions and 152 deletions.
diff --git a/scripts/generate/mapi-resources.yaml b/scripts/generate/mapi-resources.yaml
@@ -82,3 +82,23 @@
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     crdURL: https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepools.yaml
 
+- apiVersionAlias: capvv1beta1
+  apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+  resources:
+  - name: VSphereCluster
+    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+    crdURL: https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-vsphere/refs/heads/main/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml
+    verbs:
+    - get
+  - name: VSphereMachine
+    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+    crdURL: https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-vsphere/refs/heads/main/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml
+    verbs:
+    - get
+    - list
+  - name: VSphereMachineTemplate
+    apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+    crdURL: https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-vsphere/refs/heads/main/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml
+    verbs:
+    - get
+    - list
diff --git a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetControlPlaneNodes.tsx b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetControlPlaneNodes.tsx
@@ -11,6 +11,7 @@ import {
   fetchControlPlaneForClusterKey,
   fetchControlPlaneNodesForCluster,
   fetchControlPlaneNodesForClusterKey,
+  supportsAvailabilityZones,
 } from 'MAPI/utils';
 import { GenericResponseError } from 'model/clients/GenericResponseError';
 import { Providers } from 'model/constants';
@@ -166,6 +167,9 @@ const ClusterDetailWidgetControlPlaneNodes: React.FC<
       controlPlaneNodes
     );
 
+  const displayAvailabilityZones =
+    cluster && supportsAvailabilityZones(cluster);
+
   const [isSwitchingToHA, setIsSwitchingToHA] = useState(false);
 
   const onSwitchToHAExit = () => {
@@ -205,19 +209,24 @@ const ClusterDetailWidgetControlPlaneNodes: React.FC<
           )
         }
       </OptionalValue>
-      <StyledDot />
-      <Text margin={{ right: 'xsmall' }}>
-        {formatAvailabilityZonesLabel(provider, stats.availabilityZones)}
-      </Text>
-      <OptionalValue
-        value={stats.availabilityZones?.sort()}
-        loaderWidth={100}
-        loaderHeight={26}
-      >
-        {(value) => (
-          <AvailabilityZonesLabels zones={value} labelsChecked={[]} />
-        )}
-      </OptionalValue>
+
+      {displayAvailabilityZones && (
+        <>
+          <StyledDot />
+          <Text margin={{ right: 'xsmall' }}>
+            {formatAvailabilityZonesLabel(provider, stats.availabilityZones)}
+          </Text>
+          <OptionalValue
+            value={stats.availabilityZones?.sort()}
+            loaderWidth={100}
+            loaderHeight={26}
+          >
+            {(value) => (
+              <AvailabilityZonesLabels zones={value} labelsChecked={[]} />
+            )}
+          </OptionalValue>
+        </>
+      )}
 
       {canSwitchToHA && (
         <Box basis='100%' margin={{ top: 'small' }}>

diff --git a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProvider.tsx b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProvider.tsx
@@ -10,6 +10,7 @@ import { extractErrorMessage } from 'MAPI/utils';
 import { GenericResponseError } from 'model/clients/GenericResponseError';
 import * as capav1beta2 from 'model/services/mapi/capav1beta2';
 import * as capgv1beta1 from 'model/services/mapi/capgv1beta1';
+import * as capvv1beta1 from 'model/services/mapi/capvv1beta1';
 import * as capzv1beta1 from 'model/services/mapi/capzv1beta1';
 import * as legacyCredentials from 'model/services/mapi/legacy/credentials';
 import { selectOrganizations } from 'model/stores/organization/selectors';
@@ -28,6 +29,7 @@ import ClusterDetailWidgetProviderAWSManaged from './ClusterDetailWidgetProvider
 import ClusterDetailWidgetProviderAzure from './ClusterDetailWidgetProviderAzure';
 import ClusterDetailWidgetProviderCAPG from './ClusterDetailWidgetProviderCAPG';
 import ClusterDetailWidgetProviderLoader from './ClusterDetailWidgetProviderLoader';
+import ClusterDetailWidgetProviderVSphere from './ClusterDetailWidgetProviderVSphere';
 import { fetchProviderCredential, fetchProviderCredentialKey } from './utils';
 
 interface IClusterDetailWidgetProviderProps
@@ -145,6 +147,10 @@ const ClusterDetailWidgetProvider: React.FC<
                 | legacyCredentials.ICredential
             }
           />
+        ) : kind === capvv1beta1.VSphereCluster ? (
+          <ClusterDetailWidgetProviderVSphere
+            providerCluster={providerCluster as capvv1beta1.IVSphereCluster}
+          />
         ) : null}
       </Grid>
     </ClusterDetailWidget>

diff --git a/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProviderVSphere.tsx b/src/components/MAPI/clusters/ClusterDetail/ClusterDetailWidgetProviderVSphere.tsx
@@ -0,0 +1,48 @@
+import { Text } from 'grommet';
+import { normalizeColor } from 'grommet/utils';
+import * as capvv1beta1 from 'model/services/mapi/capvv1beta1';
+import React, { useMemo } from 'react';
+import styled from 'styled-components';
+import OptionalValue from 'UI/Display/OptionalValue/OptionalValue';
+
+const StyledLink = styled.a`
+  color: ${({ theme }) => normalizeColor('text-weak', theme)};
+`;
+
+interface IClusterDetailWidgetProviderAWSProps {
+  providerCluster: capvv1beta1.IVSphereCluster;
+}
+
+const ClusterDetailWidgetProviderAWS: React.FC<
+  React.PropsWithChildren<IClusterDetailWidgetProviderAWSProps>
+> = ({ providerCluster }) => {
+  const vCenter = useMemo(() => {
+    if (!providerCluster) return undefined;
+
+    return providerCluster.spec?.server ?? '';
+  }, [providerCluster]);
+
+  return (
+    <>
+      <Text>vCenter</Text>
+      <OptionalValue value={vCenter}>
+        {(value) => (
+          <StyledLink
+            href={`https://${value}/ui`}
+            rel='noopener noreferrer'
+            target='_blank'
+          >
+            <code>{value}</code>
+            <i
+              className='fa fa-open-in-new'
+              aria-hidden={true}
+              role='presentation'
+            />
+          </StyledLink>
+        )}
+      </OptionalValue>
+    </>
+  );
+};
+
+export default ClusterDetailWidgetProviderAWS;
diff --git a/...components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetControlPlaneNodes.tsx b/...components/MAPI/clusters/ClusterDetail/__tests__/ClusterDetailWidgetControlPlaneNodes.tsx
@@ -65,7 +65,7 @@ describe('ClusterDetailWidgetControlPlaneNodes', () => {
       })
     );
 
-    expect(screen.getAllByLabelText('Loading...').length).toEqual(2);
+    expect(screen.getAllByLabelText('Loading...').length).toEqual(1);
   });
 });
 

diff --git a/src/components/MAPI/clusters/CreateClusterAppBundles/schemaUtils.ts b/src/components/MAPI/clusters/CreateClusterAppBundles/schemaUtils.ts
@@ -319,19 +319,38 @@ const formPropsProviderGCP: Record<string, FormPropsPartial> = {
 const formPropsProviderVSphere: Record<string, FormPropsPartial> = {
   0: {
     uiSchema: {
-      'ui:order': ['cluster', 'controlPlane', '*'],
+      'ui:order': ['global', '*'],
+      baseDomain: {
+        'ui:widget': 'hidden',
+      },
       cluster: {
-        'ui:order': ['name', 'organization', '*'],
-        name: {
-          'ui:widget': ClusterNameWidget,
+        'ui:widget': 'hidden',
+      },
+      global: {
+        metadata: {
+          'ui:order': ['name', 'description', '*'],
+          name: {
+            'ui:widget': ClusterNameWidget,
+          },
         },
       },
+      managementCluster: {
+        'ui:widget': 'hidden',
+      },
+      provider: {
+        'ui:widget': 'hidden',
+      },
+      'cluster-shared': {
+        'ui:widget': 'hidden',
+      },
     },
     formData: (clusterName, organization) => {
       return {
-        cluster: {
-          name: clusterName,
-          organization,
+        global: {
+          metadata: {
+            name: clusterName,
+            organization,
+          },
         },
       };
     },

diff --git a/src/components/MAPI/clusters/permissions/usePermissionsForCPNodes.ts b/src/components/MAPI/clusters/permissions/usePermissionsForCPNodes.ts
@@ -3,6 +3,7 @@ import { usePermissions } from 'MAPI/permissions/usePermissions';
 import { hasPermission } from 'MAPI/permissions/utils';
 import { Providers } from 'model/constants';
 
+// eslint-disable-next-line complexity
 export function usePermissionsForCPNodes(
   provider: PropertiesOf<typeof Providers>,
   namespace: string
@@ -268,6 +269,45 @@ export function usePermissionsForCPNodes(
         );
 
       break;
+
+    case Providers.VSPHERE:
+      computed.canCreate = canCreateClusterApps;
+      computed.canDelete = canDeleteClusterApps;
+      computed.canUpdate = canUpdateClusterApps;
+
+      computed.canGet =
+        hasPermission(
+          permissions,
+          namespace,
+          'get',
+          'cluster.x-k8s.io',
+          'machines'
+        ) &&
+        hasPermission(
+          permissions,
+          namespace,
+          'get',
+          'infrastructure.cluster.x-k8s.io',
+          'vspheremachines'
+        );
+
+      computed.canList =
+        hasPermission(
+          permissions,
+          namespace,
+          'list',
+          'cluster.x-k8s.io',
+          'machines'
+        ) &&
+        hasPermission(
+          permissions,
+          namespace,
+          'list',
+          'infrastructure.cluster.x-k8s.io',
+          'vspheremachines'
+        );
+
+      break;
   }
 
   return computed;

diff --git a/src/components/MAPI/clusters/permissions/usePermissionsForClusters.ts b/src/components/MAPI/clusters/permissions/usePermissionsForClusters.ts
@@ -317,6 +317,45 @@ export function usePermissionsForClusters(
         );
 
       break;
+
+    case Providers.VSPHERE:
+      computed.canCreate = canCreateClusterApps;
+      computed.canDelete = canDeleteClusterApps;
+      computed.canUpdate = canUpdateClusterApps;
+
+      computed.canGet =
+        hasPermission(
+          permissions,
+          namespace,
+          'get',
+          'cluster.x-k8s.io',
+          'clusters'
+        ) &&
+        hasPermission(
+          permissions,
+          namespace,
+          'get',
+          'infrastructure.cluster.x-k8s.io',
+          'vsphereclusters'
+        );
+
+      computed.canList =
+        hasPermission(
+          permissions,
+          namespace,
+          'list',
+          'cluster.x-k8s.io',
+          'clusters'
+        ) &&
+        hasPermission(
+          permissions,
+          namespace,
+          'list',
+          'infrastructure.cluster.x-k8s.io',
+          'vsphereclusters'
+        );
+
+      break;
   }
 
   return computed;

diff --git a/src/components/MAPI/clusters/permissions/usePermissionsForControlPlanes.ts b/src/components/MAPI/clusters/permissions/usePermissionsForControlPlanes.ts
@@ -28,6 +28,7 @@ export function usePermissionsForControlPlanes(
   switch (provider) {
     case Providers.CAPA:
     case Providers.CAPZ:
+    case Providers.VSPHERE:
       computed.canCreate = canCreateClusterApps;
       computed.canDelete = canDeleteClusterApps;
       computed.canUpdate = canUpdateClusterApps;