Skip to content
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.

Sign up for GitHub

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

Add Deployment Controller #34

Merged
merged 17 commits into from
Oct 6, 2019
Merged

Add Deployment Controller #34

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4230214
Add Deployment Controller
enokawa Sep 14, 2019
58ccb7d
Set default value for container-port-for-code-deploy.
enokawa Sep 14, 2019
d1bf45d
Add parameters
enokawa Sep 19, 2019
cf72b5e
Fix typo
enokawa Sep 19, 2019
4da210a
Fix deployment-controller parameter type string to enum
enokawa Oct 1, 2019
e4fd0ed
Fix application-name parameter name to codedeploy-application-name
enokawa Oct 1, 2019
302f398
Fix codedeploy-application-name parameter description
enokawa Oct 1, 2019
80b9c36
Fix deployment-group-name parameter name to codedeploy-deployment-gro…
enokawa Oct 1, 2019
a84730b
Fix codedeploy-deployment-group-name parameter description
enokawa Oct 1, 2019
adcb99c
Fix container-name-for-code-deploy parameter name to codedeploy-load-…
enokawa Oct 1, 2019
3bd0e61
Fix codedeploy-load-balanced-container-name parameter description
enokawa Oct 1, 2019
102d851
Fix container-port-for-code-deploy parameter name to codedeploy-load-…
enokawa Oct 1, 2019
b7e161f
Fix codedeploy-load-balanced-container-port parameter description
enokawa Oct 1, 2019
ae19b28
Fix so that verify-revision-is-deployed can still be able to work
enokawa Oct 1, 2019
500ac8c
Fix deployment-controller parameter type string to enum
enokawa Oct 2, 2019
8efd01a
verify-revision-is-deployed does not support Blue/Green Deployment
enokawa Oct 3, 2019
fe6c9c4
Merge branch 'master' into bg-deploy
enokawa Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 89 additions & 9 deletions src/orb.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,36 @@ jobs:
"The name of the service to update. If undefined, we assume `family` is the name of both the service and task definition."
type: string
default: ""
deployment-controller:
description:
"The deployment controller to use for the service. Defaulted to ECS"
type: enum
enum: ["ECS", "CODE_DEPLOY"]
default: "ECS"
codedeploy-application-name:
description: |
The name of the AWS CodeDeploy application used for the deployment.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: string
default: ""
codedeploy-deployment-group-name:
description: |
The name of the AWS CodeDeploy deployment group used for the deployment.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: string
default: ""
codedeploy-load-balanced-container-name:
description: |
The name of the container to be load-balanced via AWS CodeDeploy.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: string
default: ""
codedeploy-load-balanced-container-port:
description: |
The port of the container to be load-balanced via AWS CodeDeploy.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: integer
default: 80
container-image-name-updates:
description: |
Use this to update the Docker image names and/or tag names of existing
Expand All @@ -158,6 +188,7 @@ jobs:
for the service. Note: enabling this may result in the build
being marked as failed if tasks for older revisions fail to be stopped
before the max number of polling attempts is reached.
Does not support ECS services that are of the Blue/Green Deployment type.
type: boolean
default: false
max-poll-attempts:
Expand Down Expand Up @@ -189,6 +220,11 @@ jobs:
family: << parameters.family >>
cluster-name: << parameters.cluster-name >>
service-name: << parameters.service-name >>
deployment-controller: << parameters.deployment-controller >>
codedeploy-application-name: << parameters.codedeploy-application-name >>
codedeploy-deployment-group-name: << parameters.codedeploy-deployment-group-name >>
codedeploy-load-balanced-container-name: << parameters.codedeploy-load-balanced-container-name >>
codedeploy-load-balanced-container-port: << parameters.codedeploy-load-balanced-container-port >>
container-image-name-updates: << parameters.container-image-name-updates >>
container-env-var-updates: << parameters.container-env-var-updates >>
verify-revision-is-deployed: << parameters.verify-revision-is-deployed >>
Expand Down Expand Up @@ -259,6 +295,7 @@ commands:
Polls the service's deployment status at intervals until the given task
definition revision is the only one deployed for the service, and for the
task definition revision's running task count to match the desired count.
Does not support ECS services that are of the Blue/Green Deployment type.
parameters:
family:
description:
Expand Down Expand Up @@ -495,6 +532,36 @@ commands:
"The name of the service to update. If undefined, we assume `family` is the name of both the service and task definition."
type: string
default: ""
deployment-controller:
description:
"The deployment controller to use for the service. Defaulted to ECS"
type: enum
enum: ["ECS", "CODE_DEPLOY"]
default: "ECS"
codedeploy-application-name:
description: |
The name of the AWS CodeDeploy application used for the deployment.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: string
default: ""
codedeploy-deployment-group-name:
description: |
The name of the AWS CodeDeploy deployment group used for the deployment.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: string
default: ""
codedeploy-load-balanced-container-name:
description: |
The name of the container to be load-balanced via AWS CodeDeploy.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: string
default: ""
codedeploy-load-balanced-container-port:
description: |
The port of the container to be load-balanced via AWS CodeDeploy.
Only effective when the deployment-controller parameter value is "CODE_DEPLOY".
type: integer
default: 80
container-image-name-updates:
description: |
Use this to update the Docker image names and/or tag names of existing
Expand All @@ -521,6 +588,7 @@ commands:
for the service. Note: enabling this may result in the build
being marked as failed if tasks for older revisions fail to be stopped
before the max number of polling attempts is reached.
Does not support ECS services that are of the Blue/Green Deployment type.
type: boolean
default: false
max-poll-attempts:
Expand Down Expand Up @@ -550,17 +618,29 @@ commands:
- run:
name: Update service with registered task definition
command: |
SERVICE_NAME="$(echo << parameters.service-name >>)"
DEPLOYMENT_CONTROLLER="$(echo << parameters.deployment-controller >>)"

if [ -z "${SERVICE_NAME}" ]; then
SERVICE_NAME="$(echo << parameters.family >>)"
if [ "${DEPLOYMENT_CONTROLLER}" = "CODE_DEPLOY" ]; then
DEPLOYED_REVISION="${CCI_ORB_AWS_ECS_REGISTERED_TASK_DFN}"
DEPLOYMENT_ID=$(aws deploy create-deployment \
--application-name "<< parameters.codedeploy-application-name >>" \
--deployment-group-name "<< parameters.codedeploy-deployment-group-name >>" \
--revision '{"revisionType": "AppSpecContent", "appSpecContent": {"content": "{\"version\": 1, \"Resources\": [{\"TargetService\": {\"Type\": \"AWS::ECS::Service\", \"Properties\": {\"TaskDefinition\": \"'${CCI_ORB_AWS_ECS_REGISTERED_TASK_DFN}'\", \"LoadBalancerInfo\": {\"ContainerName\": \"<< parameters.codedeploy-load-balanced-container-name >>\", \"ContainerPort\": << parameters.codedeploy-load-balanced-container-port >>}}}}]}"}}' \
--query deploymentId)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think of the following changes? That way, the verify-revision-is-deployed parameter should still be able to work if set to true.

DEPLOYED_REVISION="${CCI_ORB_AWS_ECS_REGISTERED_TASK_DFN}"
DEPLOYMENT_ID=$(aws deploy create-deployment ...)

and also adding echo "Created CodeDeploy deployment: $DEPLOYMENT_ID"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great changes! I fixed by ae19b28 .

echo "Created CodeDeploy deployment: $DEPLOYMENT_ID"
else
SERVICE_NAME="$(echo << parameters.service-name >>)"

if [ -z "${SERVICE_NAME}" ]; then
SERVICE_NAME="$(echo << parameters.family >>)"
fi
DEPLOYED_REVISION=$(aws ecs update-service \
--cluster "<< parameters.cluster-name >>" \
--service "${SERVICE_NAME}" \
--task-definition "${CCI_ORB_AWS_ECS_REGISTERED_TASK_DFN}" \
--output text \
--query service.taskDefinition)
fi
DEPLOYED_REVISION=$(aws ecs update-service \
--cluster "<< parameters.cluster-name >>" \
--service "${SERVICE_NAME}" \
--task-definition "${CCI_ORB_AWS_ECS_REGISTERED_TASK_DFN}" \
--output text \
--query service.taskDefinition)
echo "export CCI_ORB_AWS_ECS_DEPLOYED_REVISION='${DEPLOYED_REVISION}'" >> $BASH_ENV
- when:
condition: << parameters.verify-revision-is-deployed >>
Expand Down