diff --git a/packages/manager/src/features/Kubernetes/CreateCluster/ControlPlaneACLPane.tsx b/packages/manager/src/features/Kubernetes/CreateCluster/ControlPlaneACLPane.tsx index d831a856ce9..352a6ff9afd 100644 --- a/packages/manager/src/features/Kubernetes/CreateCluster/ControlPlaneACLPane.tsx +++ b/packages/manager/src/features/Kubernetes/CreateCluster/ControlPlaneACLPane.tsx @@ -71,7 +71,7 @@ export const ControlPlaneACLPane = (props: ControlPlaneACLProps) => { - + { /> {enableControlPlaneACL && ( - + { const { data: account } = useAccount(); const { showHighAvailability } = getKubeHighAvailability(account); const { showControlPlaneACL } = getKubeControlPlaneACL(account); - const [ipV4Addr, setIPv4Addr] = React.useState([]); - const [ipV6Addr, setIPv6Addr] = React.useState([]); + const [ipV4Addr, setIPv4Addr] = React.useState([ + stringToExtendedIP(''), + ]); + const [ipV6Addr, setIPv6Addr] = React.useState([ + stringToExtendedIP(''), + ]); const { data: kubernetesHighAvailabilityTypesData, diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterControlPlaneACL.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterControlPlaneACL.tsx index 6eb03981aa1..24bd73aca87 100644 --- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterControlPlaneACL.tsx +++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterControlPlaneACL.tsx @@ -130,7 +130,7 @@ export const KubeClusterControlPlaneACL = React.memo((props: Props) => { const availableActions = [ isLoadingKubernetesACL ? ( - + ) : failedMigrationStatus() ? ( ) : enabledACL ? ( diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeControlPaneACLDrawer.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeControlPaneACLDrawer.tsx index 70eb9cce941..07e05732d58 100644 --- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeControlPaneACLDrawer.tsx +++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeControlPaneACLDrawer.tsx @@ -59,6 +59,8 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { const _revisionID = data?.acl?.['revision-id']; + const _hideEnableFromUI = !clusterMigrated || !_enabled; + // respective react states const [ipV4Addr, setIPv4Addr] = React.useState([]); const [ipV6Addr, setIPv6Addr] = React.useState([]); @@ -72,17 +74,19 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { React.useEffect(() => { if (open && !isLoadingKubernetesACL && !isFetchingKubernetesACL) { // updates states based on queried data - setIPv4Addr( - _ipv4 ? _ipv4 : clusterMigrated ? [] : [stringToExtendedIP('0.0.0.0/0')] - ); - setIPv6Addr( - _ipv6 ? _ipv6 : clusterMigrated ? [] : [stringToExtendedIP('::/0')] - ); + setIPv4Addr(_ipv4 ? _ipv4 : [stringToExtendedIP('')]); + setIPv6Addr(_ipv6 ? _ipv6 : [stringToExtendedIP('')]); setControlPlaneACL(_enabled ? _enabled : false); setRevisionID(_revisionID ? _revisionID : ''); setUpdateACLError(isErrorKubernetesACL?.[0].reason); setUpdating(false); - setSubmitButtonLabel(clusterMigrated ? 'Update' : 'Install'); + setSubmitButtonLabel( + _hideEnableFromUI + ? 'Enable IPACL' + : clusterMigrated + ? 'Update IPACL' + : 'Install IPACL' + ); refetchKubernetesACL(); } }, [open]); @@ -121,7 +125,7 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { const payload: KubernetesControlPlaneACLPayload = { acl: { - enabled: clusterMigrated ? controlPlaneACL : true, // new cluster installations default to true + enabled: _hideEnableFromUI ? true : controlPlaneACL, // both new cluster installations as well as all the states where the UI disabled the option for the user to enable, we default to true 'revision-id': revisionID, ...((_ipv4.length > 0 || _ipv6.length > 0) && { addresses: { @@ -188,11 +192,10 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { if (!clusterMigrated) { return ( <> - + IPACL is not yet installed on this cluster.... may take up to 10 minutes or more, before ACLs are enforced... - ); } else { @@ -264,7 +267,7 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { Addresses - + A list of individual ipv4 and ipv6 addresses or CIDRs to ALLOW access to the control plane. @@ -299,9 +302,7 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { - - - {clusterMigrated && ( + {!_hideEnableFromUI && ( <> @@ -327,6 +328,7 @@ export const KubeControlPlaneACLDrawer = (props: Props) => { + { secondaryButtonProps={{ label: 'Cancel', onClick: closeDrawer }} /> - + diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeSummaryPanel.styles.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeSummaryPanel.styles.tsx index cc035598a43..6fc60b1dde3 100644 --- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeSummaryPanel.styles.tsx +++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeSummaryPanel.styles.tsx @@ -72,7 +72,7 @@ export const StyledBox = styled(Box, { label: 'StyledBox' })(({ theme }) => ({ export const StyledLabelBox = styled(Box, { label: 'StyledLabelBox' })( ({ theme }) => ({ fontFamily: theme.font.bold, - marginRight: '4px', + marginRight: '8px', }) );