diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx index 51f2137f4f4d1..9439b9a174b93 100644 --- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx +++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx @@ -17,7 +17,7 @@ */ import React, { useState, useEffect } from 'react'; -import styled from 'styled-components'; +import styled, { useTheme } from 'styled-components'; import { Box, ButtonSecondary, @@ -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'; @@ -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 ( <>
Automatically Deploy a Database Service
@@ -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 ({region}). You will only need to do this once per geographical region. + + + + + {!wantAutoDiscover && ( <>
-
- 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?{' '} )} - +
); }; diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx index b11ce6f538237..cc5ed4bb590b4 100644 --- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx +++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx @@ -125,10 +125,10 @@ export const SelectSecurityGroups = ({ return ( <> - Select Security Groups + Select ECS Security Groups - Select security group(s) based on the following requirements: + Select ECS security group(s) based on the following requirements:
  • The selected security group(s) must allow all outbound traffic @@ -145,7 +145,7 @@ export const SelectSecurityGroups = ({

    - 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.

    diff --git a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx index e118eb776324c..785ec15fbda9e 100644 --- a/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx +++ b/web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx @@ -120,7 +120,7 @@ export function SelectSubnetIds({ return ( <> - Select Subnets + Select ECS Subnets A subnet has an outbound internet route if it has a route to an @@ -130,9 +130,9 @@ export function SelectSubnetIds({ - 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. {attempt.status === 'failed' && ( <> diff --git a/web/packages/teleport/src/Discover/Database/aws-ecs-bblp.svg b/web/packages/teleport/src/Discover/Database/aws-ecs-bblp.svg new file mode 100644 index 0000000000000..001c9a45b5611 --- /dev/null +++ b/web/packages/teleport/src/Discover/Database/aws-ecs-bblp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/packages/teleport/src/Discover/Database/aws-ecs-dark.svg b/web/packages/teleport/src/Discover/Database/aws-ecs-dark.svg new file mode 100644 index 0000000000000..1e13cb1ec8340 --- /dev/null +++ b/web/packages/teleport/src/Discover/Database/aws-ecs-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/packages/teleport/src/Discover/Database/aws-ecs-light.svg b/web/packages/teleport/src/Discover/Database/aws-ecs-light.svg new file mode 100644 index 0000000000000..f2362f51a167c --- /dev/null +++ b/web/packages/teleport/src/Discover/Database/aws-ecs-light.svg @@ -0,0 +1 @@ + \ No newline at end of file