Skip to content

Commit 1300d58

Browse files
author
Feroze Mohideen
authored
Vpc overlapping cidr (#4353)
1 parent a081d20 commit 1300d58

File tree

3 files changed

+28
-15
lines changed

3 files changed

+28
-15
lines changed

dashboard/src/components/porter/Error.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ export const Error: React.FC<Props> = ({
3030
<i className="material-icons">error_outline</i>
3131
<Block>
3232
<Text color={"#ff385d"}>Error: {message}</Text>
33+
<Spacer y={0.5} />
34+
{metadata &&
35+
Object.entries(metadata).map(([key, value]) => (
36+
<div key={key}>
37+
<ErrorMessageLabel>{key}:</ErrorMessageLabel>
38+
<ErrorMessageContent>{value}</ErrorMessageContent>
39+
</div>
40+
))}
3341
{ctaText && (errorModalContents != null || ctaOnClick != null) && (
3442
<>
3543
<Spacer y={0.5} />
36-
{metadata &&
37-
Object.entries(metadata).map(([key, value]) => (
38-
<div key={key}>
39-
<ErrorMessageLabel>{key}:</ErrorMessageLabel>
40-
<ErrorMessageContent>{value}</ErrorMessageContent>
41-
</div>
42-
))}
43-
<Spacer y={0.5} />
4444
<Cta
4545
onClick={() => {
4646
errorModalContents ? setErrorModalOpen(true) : ctaOnClick?.();

dashboard/src/lib/clusters/constants.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,6 +1216,10 @@ const SUPPORTED_AWS_PREFLIGHT_CHECKS: PreflightCheck[] = [
12161216
displayName: "vCPU availability",
12171217
resolution: AWS_VCPUS_QUOTA_RESOLUTION,
12181218
},
1219+
{
1220+
name: "cidrAvailability",
1221+
displayName: "CIDR availability",
1222+
},
12191223
];
12201224

12211225
const SUPPORTED_AZURE_PREFLIGHT_CHECKS: PreflightCheck[] = [

dashboard/src/main/home/infrastructure-dashboard/modals/PreflightChecksModal.tsx

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Loading from "components/Loading";
66
import { Error as ErrorComponent } from "components/porter/Error";
77
import Expandable from "components/porter/Expandable";
88
import Modal from "components/porter/Modal";
9+
import ShowIntercomButton from "components/porter/ShowIntercomButton";
910
import Spacer from "components/porter/Spacer";
1011
import StatusDot from "components/porter/StatusDot";
1112
import Text from "components/porter/Text";
@@ -93,13 +94,21 @@ const PreflightChecksModal: React.FC<Props> = ({
9394
following issues or change your cluster configuration and try again.
9495
</Text>
9596
<Spacer y={1} />
96-
{preflightChecks.map((pfc, idx) => (
97-
<CheckItem
98-
preflightCheck={pfc}
99-
key={pfc.title}
100-
preExpanded={idx === 0}
101-
/>
102-
))}
97+
<div style={{ display: "flex", flexDirection: "column", gap: "10px" }}>
98+
{preflightChecks.map((pfc, idx) => (
99+
<CheckItem
100+
preflightCheck={pfc}
101+
key={pfc.title}
102+
preExpanded={idx === 0}
103+
/>
104+
))}
105+
</div>
106+
<Spacer y={1} />
107+
<ShowIntercomButton
108+
message={"I need help resolving cluster preflight checks."}
109+
>
110+
Talk to support
111+
</ShowIntercomButton>
103112
</AppearingDiv>
104113
</Modal>
105114
);

0 commit comments

Comments
 (0)