Skip to content

Commit

Permalink
WebDiscover: add clarifying diagram on deploying ecs step for RDS (#4…
Browse files Browse the repository at this point in the history
…6915)

* WebDiscover: add clarifying diagram on deploying ecs step for RDS

* Run svgs through ImageOptim

* Address CRs

---------

Co-authored-by: Rafał Cieślak <[email protected]>
  • Loading branch information
kimlisa and ravicious authored Nov 13, 2024
1 parent 78ec462 commit bb8c2f3
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import React, { useState, useEffect } from 'react';
import styled from 'styled-components';
import styled, { useTheme } from 'styled-components';
import {
Box,
ButtonSecondary,
Expand Down Expand Up @@ -62,6 +62,9 @@ import {
Header,
AlternateInstructionButton,
} from '../../../Shared';
import awsEcsLight from '../../aws-ecs-light.svg';
import awsEcsDark from '../../aws-ecs-dark.svg';
import awsEcsBblp from '../../aws-ecs-bblp.svg';

import { DeployServiceProp } from '../DeployService';

Expand Down Expand Up @@ -343,6 +346,11 @@ const Heading = ({
region: string;
wantAutoDiscover: boolean;
}) => {
const theme = useTheme();
let img = theme.type === 'light' ? awsEcsLight : awsEcsDark;
if (theme.isCustomTheme && theme.name === 'bblp') {
img = awsEcsBblp;
}
return (
<>
<Header>Automatically Deploy a Database Service</Header>
Expand All @@ -352,19 +360,23 @@ const Heading = ({
ECS Fargate container (2vCPU, 4GB memory) in your Amazon account with
the ability to access databases in this region (<Mark>{region}</Mark>).
You will only need to do this once per geographical region.
</HeaderSubtitle>
<Box mb={5} mt={-3}>
<Box minWidth="500px" maxWidth="998px">
<img src={img} width="100%" />
</Box>
{!wantAutoDiscover && (
<>
<br />
<br />
Want to deploy a database service manually from one of your existing
servers?{' '}
Do you want to deploy a database service manually from one of your
existing servers?{' '}
<AlternateInstructionButton
onClick={toggleDeployMethod}
disabled={togglerDisabled}
/>
</>
)}
</HeaderSubtitle>
</Box>
</>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ export const SelectSecurityGroups = ({
return (
<>
<Flex alignItems="center" gap={1} mb={2}>
<Subtitle3>Select Security Groups</Subtitle3>
<Subtitle3>Select ECS Security Groups</Subtitle3>
<ToolTipInfo>
<Text>
Select security group(s) based on the following requirements:
Select ECS security group(s) based on the following requirements:
<ul>
<li>
The selected security group(s) must allow all outbound traffic
Expand All @@ -145,7 +145,7 @@ export const SelectSecurityGroups = ({
</Flex>

<P mb={2}>
Select security groups to assign to the Fargate service that will be
Select ECS security groups to assign to the Fargate service that will be
running the Teleport Database Service. If you don't select any security
groups, the default one for the VPC will be used.
</P>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export function SelectSubnetIds({
return (
<>
<Flex alignItems="center" gap={1} mb={2}>
<Subtitle3>Select Subnets</Subtitle3>
<Subtitle3>Select ECS Subnets</Subtitle3>
<ToolTipInfo>
<Text>
A subnet has an outbound internet route if it has a route to an
Expand All @@ -130,9 +130,9 @@ export function SelectSubnetIds({
</Flex>

<Text mb={2}>
Select subnets to assign to the Fargate service that will be running the
Teleport Database Service. All of the subnets you select must have an
outbound internet route and a local route to the database subnets.
Select ECS subnets to assign to the Fargate service that will be running
the Teleport Database Service. All of the subnets you select must have
an outbound internet route and a local route to the database subnets.
</Text>
{attempt.status === 'failed' && (
<>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bb8c2f3

Please sign in to comment.