-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CONTINT-3529] Add basic ecs fargate windows app #571
Open
AliDatadog
wants to merge
6
commits into
main
Choose a base branch
from
ali/ecs-fargate-windows
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
078b9d2
add basic ecs fargate app
AliDatadog 7289cfe
Merge branch 'main' into ali/ecs-fargate-windows
AliDatadog 4bbe63c
add health check + use port 8080
AliDatadog d84b06b
remove load balancer
AliDatadog 2d84423
Merge branch 'main' into ali/ecs-fargate-windows
AliDatadog 2d598ad
fix merge issues
AliDatadog File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| package aspnetsample | ||
|
|
||
| import ( | ||
| "github.com/DataDog/test-infra-definitions/common/config" | ||
| "github.com/DataDog/test-infra-definitions/common/utils" | ||
| fakeintakeComp "github.com/DataDog/test-infra-definitions/components/datadog/fakeintake" | ||
| "github.com/DataDog/test-infra-definitions/resources/aws" | ||
| ecsClient "github.com/DataDog/test-infra-definitions/resources/aws/ecs" | ||
| classicECS "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ecs" | ||
| "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/ecs" | ||
| "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/lb" | ||
| "github.com/pulumi/pulumi/sdk/v3/go/pulumi" | ||
| ) | ||
|
|
||
| type EcsFargateComponent struct { | ||
| pulumi.ResourceState | ||
| } | ||
|
|
||
| func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiKeySSMParamName pulumi.StringInput, fakeIntake *fakeintakeComp.Fakeintake, opts ...pulumi.ResourceOption) (*EcsFargateComponent, error) { | ||
| namer := e.Namer.WithPrefix("aspnetsample").WithPrefix("fg") | ||
|
|
||
| opts = append(opts, e.WithProviders(config.ProviderAWS, config.ProviderAWSX)) | ||
|
|
||
| EcsFargateComponent := &EcsFargateComponent{} | ||
| if err := e.Ctx.RegisterComponentResource("dd:apps", namer.ResourceName("grp"), EcsFargateComponent, opts...); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| opts = append(opts, pulumi.Parent(EcsFargateComponent)) | ||
|
|
||
| nlb, err := lb.NewNetworkLoadBalancer(e.Ctx, namer.ResourceName("lb"), &lb.NetworkLoadBalancerArgs{ | ||
| Name: e.CommonNamer.DisplayName(32, pulumi.String("aspnetsample"), pulumi.String("fg")), | ||
| SubnetIds: e.RandomSubnets(), | ||
| Internal: pulumi.BoolPtr(true), | ||
| DefaultTargetGroup: &lb.TargetGroupArgs{ | ||
| Name: e.CommonNamer.DisplayName(32, pulumi.String("aspnetsample"), pulumi.String("fg")), | ||
| Port: pulumi.IntPtr(8080), | ||
| Protocol: pulumi.StringPtr("TCP"), | ||
| TargetType: pulumi.StringPtr("ip"), | ||
| VpcId: pulumi.StringPtr(e.DefaultVPCID()), | ||
| }, | ||
| Listener: &lb.ListenerArgs{ | ||
| Port: pulumi.IntPtr(8080), | ||
| Protocol: pulumi.StringPtr("TCP"), | ||
| }, | ||
| }, opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| serverContainer := &ecs.TaskDefinitionContainerDefinitionArgs{ | ||
| Name: pulumi.String("aspnetsample"), | ||
| Image: pulumi.String("mcr.microsoft.com/dotnet/samples:aspnetapp-nanoserver-ltsc2022"), | ||
| DockerLabels: pulumi.StringMap{ | ||
| "com.datadoghq.ad.checks": pulumi.String(utils.JSONMustMarshal( | ||
| map[string]interface{}{ | ||
| "http_check": map[string]interface{}{ | ||
| "init_config": map[string]interface{}{}, | ||
| "instances": []map[string]interface{}{ | ||
| { | ||
| "name": "aspnetsample", | ||
| "url": "http://%%host%%:8080", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| )), | ||
| "com.datadoghq.ad.tags": pulumi.String("[\"ecs_launch_type:fargate\"]"), | ||
| }, | ||
| Cpu: pulumi.IntPtr(1024), | ||
| Memory: pulumi.IntPtr(2048), | ||
| Essential: pulumi.BoolPtr(true), | ||
| DependsOn: ecs.TaskDefinitionContainerDependencyArray{ | ||
| ecs.TaskDefinitionContainerDependencyArgs{ | ||
| ContainerName: pulumi.String("datadog-agent"), | ||
| Condition: pulumi.String("HEALTHY"), | ||
| }, | ||
| }, | ||
| PortMappings: ecs.TaskDefinitionPortMappingArray{ | ||
| ecs.TaskDefinitionPortMappingArgs{ | ||
| ContainerPort: pulumi.IntPtr(8080), | ||
| HostPort: pulumi.IntPtr(8080), | ||
| Protocol: pulumi.StringPtr("tcp"), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| serverTaskDef, err := ecsClient.FargateWindowsTaskDefinitionWithAgent(e, "aspnet-fg-server", pulumi.String("aspnet-fg"), 1024, 2048, map[string]ecs.TaskDefinitionContainerDefinitionArgs{"aspnetsample": *serverContainer}, apiKeySSMParamName, fakeIntake, opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if _, err := ecs.NewFargateService(e.Ctx, namer.ResourceName("server"), &ecs.FargateServiceArgs{ | ||
| Cluster: clusterArn, | ||
| Name: e.CommonNamer.DisplayName(255, pulumi.String("aspnetsample"), pulumi.String("fg")), | ||
| DesiredCount: pulumi.IntPtr(1), | ||
| NetworkConfiguration: classicECS.ServiceNetworkConfigurationArgs{ | ||
| AssignPublicIp: pulumi.BoolPtr(e.ECSServicePublicIP()), | ||
| SecurityGroups: pulumi.ToStringArray(e.DefaultSecurityGroups()), | ||
| Subnets: nlb.LoadBalancer.Subnets(), | ||
| }, | ||
| TaskDefinition: serverTaskDef.TaskDefinition.Arn(), | ||
| EnableExecuteCommand: pulumi.BoolPtr(true), | ||
| ContinueBeforeSteadyState: pulumi.BoolPtr(true), | ||
| LoadBalancers: classicECS.ServiceLoadBalancerArray{ | ||
| &classicECS.ServiceLoadBalancerArgs{ | ||
| ContainerName: pulumi.String("aspnetsample"), | ||
| ContainerPort: pulumi.Int(8080), | ||
| TargetGroupArn: nlb.DefaultTargetGroup.Arn(), | ||
| }, | ||
| }, | ||
| }, opts...); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return EcsFargateComponent, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need an LB?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was thinking of adding a query app too in another PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the load balancer so we can add it in another PR if needed