Skip to content

Commit

Permalink
add support for service cidr, show it in the create form (#4364)
Browse files Browse the repository at this point in the history
  • Loading branch information
Feroze Mohideen authored Mar 4, 2024
1 parent 3330496 commit b67ec67
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 8 deletions.
7 changes: 6 additions & 1 deletion dashboard/src/lib/clusters/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ function clientEKSConfigToProto(
});
}),
network: new AWSClusterNetwork({
...(existingConfig?.network ?? { serviceCidr: "172.20.0.0/16" }), // serviceCidr explicitly added for backwards compatibility with contracts without network fields
...(existingConfig?.network ?? {}),
vpcCidr: clientConfig.cidrRange,
serviceCidr: clientConfig.serviceCidrRange,
}),
loadBalancer: new LoadBalancer({
loadBalancerType: match(clientConfig.loadBalancer.type)
Expand Down Expand Up @@ -164,6 +165,7 @@ function clientGKEConfigToProto(
network: new GKENetwork({
...(existingConfig?.network ?? {}),
cidrRange: clientConfig.cidrRange,
serviceCidr: clientConfig.serviceCidrRange,
}),
});
}
Expand Down Expand Up @@ -251,6 +253,7 @@ const clientEKSConfigFromProto = (value: EKS): EKSClientClusterConfig => {
};
}),
cidrRange: value.network?.vpcCidr ?? value.cidrRange ?? "", // network will always be provided in one of those fields
serviceCidrRange: value.network?.serviceCidr ?? "172.20.0.0/16", // serviceCidr explicitly added for backwards compatibility with contracts without network fields
logging: {
isApiServerLogsEnabled: value.logging?.enableApiServerLogs ?? false,
isAuditLogsEnabled: value.logging?.enableAuditLogs ?? false,
Expand Down Expand Up @@ -321,6 +324,7 @@ const clientGKEConfigFromProto = (value: GKE): GKEClientClusterConfig => {
};
}),
cidrRange: value.network?.cidrRange ?? "", // network will always be provided
serviceCidrRange: value.network?.serviceCidr ?? "",
};
};

Expand Down Expand Up @@ -349,5 +353,6 @@ const clientAKSConfigFromProto = (value: AKS): AKSClientClusterConfig => {
.with(AksSkuTier.STANDARD, () => "STANDARD" as const)
.otherwise(() => "UNKNOWN" as const),
cidrRange: value.cidrRange,
serviceCidrRange: "172.20.0.0/16", // not yet supported by AKS, this is a placeholder
};
};
3 changes: 3 additions & 0 deletions dashboard/src/lib/clusters/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ const eksConfigValidator = z.object({
region: awsRegionValidator,
nodeGroups: eksNodeGroupValidator.array(),
cidrRange: cidrRangeValidator,
serviceCidrRange: cidrRangeValidator,
logging: z
.object({
isApiServerLogsEnabled: z.boolean(),
Expand Down Expand Up @@ -472,6 +473,7 @@ const gkeConfigValidator = z.object({
region: gcpRegionValidator,
nodeGroups: gkeNodeGroupValidator.array(),
cidrRange: cidrRangeValidator,
serviceCidrRange: cidrRangeValidator,
});
const aksConfigValidator = z.object({
kind: z.literal("AKS"),
Expand All @@ -481,6 +483,7 @@ const aksConfigValidator = z.object({
nodeGroups: aksNodeGroupValidator.array(),
skuTier: z.enum(["UNKNOWN", "FREE", "STANDARD"]),
cidrRange: cidrRangeValidator,
serviceCidrRange: cidrRangeValidator,
});
const clusterConfigValidator = z.discriminatedUnion("kind", [
eksConfigValidator,
Expand Down
14 changes: 13 additions & 1 deletion dashboard/src/main/home/infrastructure-dashboard/forms/aws/ConfigureEKSCluster.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const ConfigureEKSCluster: React.FC<Props> = ({ goBack }) => {
<Text size={16}>CIDR range</Text>
<Spacer y={0.5} />
<Text color="helper">
Specify the CIDR range for your cluster.
Specify the VPC CIDR range for your cluster.
</Text>
<Spacer y={0.7} />
<ControlledInput
Expand All @@ -103,6 +103,18 @@ const ConfigureEKSCluster: React.FC<Props> = ({ goBack }) => {
error={errors.cluster?.config?.cidrRange?.message}
{...register("cluster.config.cidrRange")}
/>
<Spacer y={0.5} />
<Text color="helper">
Specify the service CIDR range for your cluster.
</Text>
<Spacer y={0.7} />
<ControlledInput
placeholder="ex: 172.20.0.0/16"
type="text"
width="300px"
error={errors.cluster?.config?.serviceCidrRange?.message}
{...register("cluster.config.serviceCidrRange")}
/>
</>
) : null,
<>
Expand Down
1 change: 1 addition & 0 deletions dashboard/src/main/home/infrastructure-dashboard/forms/aws/CreateEKSClusterForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const CreateEKSClusterForm: React.FC<Props> = ({
},
],
cidrRange: "10.78.0.0/16",
serviceCidrRange: "172.20.0.0/16",
},
},
});
Expand Down
1 change: 1 addition & 0 deletions dashboard/src/main/home/infrastructure-dashboard/forms/azure/CreateAKSClusterForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const CreateAKSClusterForm: React.FC<Props> = ({
},
],
cidrRange: "10.78.0.0/16",
serviceCidrRange: "172.20.0.0/16", // does not actually go into contract because not supported there yet
skuTier: "FREE" as const,
},
},
Expand Down
14 changes: 13 additions & 1 deletion dashboard/src/main/home/infrastructure-dashboard/forms/gcp/ConfigureGKECluster.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const ConfigureGKECluster: React.FC<Props> = ({ goBack }) => {
<Text size={16}>CIDR range</Text>
<Spacer y={0.5} />
<Text color="helper">
Specify the CIDR range for your cluster.
Specify the VPC CIDR range for your cluster.
</Text>
<Spacer y={0.7} />
<ControlledInput
Expand All @@ -108,6 +108,18 @@ const ConfigureGKECluster: React.FC<Props> = ({ goBack }) => {
error={errors.cluster?.config?.cidrRange?.message}
{...register("cluster.config.cidrRange")}
/>
<Spacer y={0.5} />
<Text color="helper">
Specify the service CIDR range for your cluster.
</Text>
<Spacer y={0.7} />
<ControlledInput
placeholder="ex: 172.20.0.0/16"
type="text"
width="300px"
error={errors.cluster?.config?.serviceCidrRange?.message}
{...register("cluster.config.serviceCidrRange")}
/>
</>
) : null,
<>
Expand Down
1 change: 1 addition & 0 deletions dashboard/src/main/home/infrastructure-dashboard/forms/gcp/CreateGKEClusterForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ const CreateGKEClusterForm: React.FC<Props> = ({
},
],
cidrRange: "10.78.0.0/16",
serviceCidrRange: "172.20.0.0/16",
},
},
});
Expand Down
10 changes: 7 additions & 3 deletions dashboard/src/main/home/infrastructure-dashboard/shared/NodeGroups.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ import world from "assets/world.svg";

type Props = {
availableMachineTypes: ClientMachineType[];
isDefaultExpanded?: boolean;
};
const NodeGroups: React.FC<Props> = ({ availableMachineTypes }) => {
const NodeGroups: React.FC<Props> = ({
availableMachineTypes,
isDefaultExpanded = true,
}) => {
const { control } = useFormContext<ClientClusterContract>();
const { currentProject } = useContext(Context);
const {
Expand Down Expand Up @@ -52,7 +56,7 @@ const NodeGroups: React.FC<Props> = ({ availableMachineTypes }) => {
{displayableNodeGroups.APPLICATION?.map((ng) => {
return (
<Expandable
preExpanded={false}
preExpanded={isDefaultExpanded}
key={ng.nodeGroup.id}
header={
<Container row>
Expand Down Expand Up @@ -129,7 +133,7 @@ const NodeGroups: React.FC<Props> = ({ availableMachineTypes }) => {
{displayableNodeGroups.CUSTOM?.map((ng) => {
return (
<Expandable
preExpanded={false}
preExpanded={isDefaultExpanded}
key={ng.nodeGroup.id}
header={
<Container row spaced>
Expand Down
1 change: 1 addition & 0 deletions dashboard/src/main/home/infrastructure-dashboard/tabs/overview/AKSClusterOverview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const AKSClusterOverview: React.FC = () => {
availableMachineTypes={CloudProviderAzure.machineTypes.filter((mt) =>
mt.supportedRegions.includes(region)
)}
isDefaultExpanded={false}
/>
</>
);
Expand Down
5 changes: 4 additions & 1 deletion dashboard/src/main/home/infrastructure-dashboard/tabs/overview/EKSClusterOverview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ const EKSClusterOverview: React.FC = () => {
</a>
</Text>
<Spacer y={1} />
<NodeGroups availableMachineTypes={CloudProviderAWS.machineTypes} />
<NodeGroups
availableMachineTypes={CloudProviderAWS.machineTypes}
isDefaultExpanded={false}
/>
</>
);
};
Expand Down
5 changes: 4 additions & 1 deletion dashboard/src/main/home/infrastructure-dashboard/tabs/overview/GKEClusterOverview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ const GKEClusterOverview: React.FC = () => {
</a>
</Text>
<Spacer y={1} />
<NodeGroups availableMachineTypes={CloudProviderGCP.machineTypes} />
<NodeGroups
availableMachineTypes={CloudProviderGCP.machineTypes}
isDefaultExpanded={false}
/>
</>
);
};
Expand Down

0 comments on commit b67ec67

Please sign in to comment.