ecs_service supports constraints and strategy update #1601
Merged
Conversation
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
ansibullbot
added
bug
zhoufeng1989
changed the title
markuman
added
backport-4
|
@zhoufeng1989 looks basically good to me. |
Sure, will do it |
|
hi, @markuman , integration test cases are added, would you please have a look? thanks~ |
|
@zhoufeng1989 can you apply those changes? diff --git a/tests/integration/targets/ecs_cluster/tasks/main.yml b/tests/integration/targets/ecs_cluster/tasks/main.yml
index d105d087..7c81a346 100644
--- a/tests/integration/targets/ecs_cluster/tasks/main.yml
+++ b/tests/integration/targets/ecs_cluster/tasks/main.yml
@@ -108,19 +108,21 @@
vpc_id: '{{ setup_vpc.vpc.id }}'
rules: # allow all ssh traffic but nothing else
- ports: 22
- cidr: 0.0.0.0/0
+ cidr_ip: 0.0.0.0/0
register: setup_sg
- - name: find a suitable AMI
- ec2_ami_info:
- owner: amazon
- filters:
- description: "Amazon Linux AMI* ECS *"
- register: ec2_ami_info
+ - set_fact:
+ # As a lookup plugin we don't have access to module_defaults
+ connection_args:
+ region: "{{ aws_region }}"
+ aws_access_key: "{{ aws_access_key }}"
+ aws_secret_key: "{{ aws_secret_key }}"
+ aws_security_token: "{{ security_token | default(omit) }}"
+ no_log: True
- name: set image id fact
set_fact:
- ecs_image_id: "{{ (ec2_ami_info.images|last).image_id }}"
+ ecs_image_id: "{{ lookup('aws_ssm', '/aws/service/ecs/optimized-ami/amazon-linux-2/recommended/image_id', **connection_args) }}"
- name: provision ec2 instance to create an image
ec2_instance:
@@ -146,6 +148,10 @@
modify_targets: no
vpc_id: '{{ setup_vpc.vpc.id }}'
target_type: instance
+ health_check_interval: 5
+ health_check_timeout: 2
+ healthy_threshold_count: 2
+ unhealthy_threshold_count: 2
register: elb_target_group_instance
- name: create second target group to use ip target_type
@@ -157,6 +163,10 @@
modify_targets: no
vpc_id: '{{ setup_vpc.vpc.id }}'
target_type: ip
+ health_check_interval: 5
+ health_check_timeout: 2
+ healthy_threshold_count: 2
+ unhealthy_threshold_count: 2
register: elb_target_group_ip
- name: create load balancer
@@ -618,8 +628,8 @@
assert:
that:
- ecs_service_creation_constraints.changed
- - "{{ ecs_service_creation_constraints.service.placementConstraints | length }} == 1"
- - "{{ ecs_service_creation_constraints.service.placementConstraints[0].type }} == distinctInstance"
+ - "ecs_service_creation_constraints.service.placementConstraints | length == 1"
+ - "ecs_service_creation_constraints.service.placementConstraints[0].type == 'distinctInstance'"
- name: Update ecs service's placement constraints
ecs_service:
@@ -642,9 +652,9 @@
assert:
that:
- ecs_service_update_constraints.changed
- - "{{ ecs_service_update_constraints.service.placementConstraints | length }} == 1"
- - "{{ ecs_service_update_constraints.service.placementConstraints[0].type }} == memberOf"
- - "{{ ecs_service_update_constraints.service.placementConstraints[0].expression }} == 'attribute:ecs.instance-type == t3.micro'"
+ - "ecs_service_update_constraints.service.placementConstraints | length == 1"
+ - "ecs_service_update_constraints.service.placementConstraints[0].type == 'memberOf'"
+ - "ecs_service_update_constraints.service.placementConstraints[0].expression == 'attribute:ecs.instance-type == t3.micro'"
- name: Create ecs service with placement strategy
ecs_service:
@@ -667,9 +677,9 @@
assert:
that:
- ecs_service_creation_strategy.changed
- - "{{ ecs_service_creation_strategy.service.placementplacementStrategy | length }} == 1"
- - "{{ ecs_service_creation_strategy.service.placementConstraints[0].type }} == binpack"
- - "{{ ecs_service_creation_strategy.service.placementConstraints[0].field }} == MEMORY"
+ - "ecs_service_creation_strategy.service.placementplacementStrategy | length == 1"
+ - "ecs_service_creation_strategy.service.placementConstraints[0].type == 'binpack'"
+ - "ecs_service_creation_strategy.service.placementConstraints[0].field == 'MEMORY'"
- name: Update ecs service's placement strategy
ecs_service:
@@ -692,9 +702,9 @@
assert:
that:
- ecs_service_update_strategy.changed
- - "{{ ecs_service_update_strategy.service.placementplacementStrategy | length }} == 1"
- - "{{ ecs_service_update_strategy.service.placementConstraints[0].type }} == spread"
- - "{{ ecs_service_update_strategy.service.placementConstraints[0].field }} == instanceId"
+ - "ecs_service_update_strategy.service.placementplacementStrategy | length == 1"
+ - "ecs_service_update_strategy.service.placementConstraints[0].type == 'spread'"
+ - "ecs_service_update_strategy.service.placementConstraints[0].field == 'instanceId'"
# ============================================================
# Begin tests for Fargate |
markuman
reviewed
Dec 2, 2022
changelogs/fragments/1601-ecs_service-support_constraints_and_strategy_update.yml
Outdated
Show resolved
Hide resolved
|
hi @markuman, thanks for review, updated. |
added 2 commits
December 20, 2022 18:12
Docs Build 📝Thank you for contribution!✨ This PR has been merged and your docs changes will be incorporated when they are next published. |
markuman
approved these changes
Jan 10, 2023
|
LGTM. |
markuman
reviewed
Jan 10, 2023
changelogs/fragments/1601-ecs_service-support_constraints_and_strategy_update.yml
Outdated
Show resolved
Hide resolved
…strategy_update.yml
markuman
reviewed
Jan 10, 2023
alinabuzachis
approved these changes
Jan 11, 2023
markuman
added
mergeit
|
recheck |
Backport to stable-4: 💚 backport PR created✅ Backport PR branch: Backported as #1648 🤖 @patchback |
patchback bot
pushed a commit
that referenced
this pull request
Jan 11, 2023
ecs_service supports constraints and strategy update SUMMARY ISSUE TYPE Bugfix Pull Request COMPONENT NAME ecs_service ADDITIONAL INFORMATION related issue #1414 Reviewed-by: Markus Bergholz <git@osuv.de> Reviewed-by: 周丰 <zhoufengloop@gmail.com> Reviewed-by: Alina Buzachis <None> (cherry picked from commit 316f0ac)
Backport to stable-5: 💚 backport PR created✅ Backport PR branch: Backported as #1650 🤖 @patchback |
patchback bot
pushed a commit
that referenced
this pull request
Jan 11, 2023
ecs_service supports constraints and strategy update SUMMARY ISSUE TYPE Bugfix Pull Request COMPONENT NAME ecs_service ADDITIONAL INFORMATION related issue #1414 Reviewed-by: Markus Bergholz <git@osuv.de> Reviewed-by: 周丰 <zhoufengloop@gmail.com> Reviewed-by: Alina Buzachis <None> (cherry picked from commit 316f0ac)
softwarefactory-project-zuul bot
pushed a commit
that referenced
this pull request
Jan 12, 2023
[PR #1601/316f0acb backport][stable-5] ecs_service supports constraints and strategy update This is a backport of PR #1601 as merged into main (316f0ac). SUMMARY ISSUE TYPE Bugfix Pull Request COMPONENT NAME ecs_service ADDITIONAL INFORMATION related issue #1414 Reviewed-by: Markus Bergholz <git@osuv.de>
softwarefactory-project-zuul bot
pushed a commit
that referenced
this pull request
Jan 12, 2023
[PR #1601/316f0acb backport][stable-4] ecs_service supports constraints and strategy update This is a backport of PR #1601 as merged into main (316f0ac). SUMMARY ISSUE TYPE Bugfix Pull Request COMPONENT NAME ecs_service ADDITIONAL INFORMATION related issue #1414 Reviewed-by: Markus Bergholz <git@osuv.de>
abikouo
pushed a commit
to abikouo/community.aws
that referenced
this pull request
Oct 24, 2023
…#1605) Update main branch after release 6.1.0 and 6.0.1 SUMMARY Update main branch after release 6.1.0 ISSUE TYPE Bugfix Pull Request Docs Pull Request Feature Pull Request New Module Pull Request COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Mike Graves <mgraves@redhat.com> Reviewed-by: Helen Bailey <hebailey@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SUMMARY
ISSUE TYPE
COMPONENT NAME
ecs_service
ADDITIONAL INFORMATION
related issue #1414