Skip to content

feat: add labels to allow runtime labels on containers#2186

Merged
mergify[bot] merged 11 commits intoaws:mainlinefrom
bvtujo:kahirul/mainline
Apr 21, 2021
Merged

feat: add labels to allow runtime labels on containers#2186
mergify[bot] merged 11 commits intoaws:mainlinefrom
bvtujo:kahirul/mainline

Conversation

@bvtujo
Copy link
Copy Markdown
Contributor

@bvtujo bvtujo commented Apr 19, 2021

Incorporates and builds on top of #2165. This addresses @efekarakus' feedback and adds a test.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Copy link
Copy Markdown
Contributor

@efekarakus efekarakus left a comment

Choose a reason for hiding this comment

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

Yay thank you for following-up on this!

Comment thread internal/pkg/manifest/backend_svc.go Outdated
Comment thread internal/pkg/manifest/job.go Outdated
Comment thread site/content/docs/manifest/backend-service.md Outdated
Comment thread site/content/docs/manifest/backend-service.md Outdated
Comment thread internal/pkg/manifest/workload.go
Copy link
Copy Markdown
Contributor

@iamhopaul123 iamhopaul123 left a comment

Choose a reason for hiding this comment

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

Thank you so much for continuing this PR!

Comment thread internal/pkg/deploy/cloudformation/stack/testdata/workloads/job-test.stack.yml Outdated
Comment thread templates/workloads/services/lb-web/cf.yml Outdated
@efekarakus efekarakus added the do-not-merge Pull requests that mergify shouldn't merge until the requester allows it. label Apr 21, 2021
Copy link
Copy Markdown
Contributor

@efekarakus efekarakus left a comment

Choose a reason for hiding this comment

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

LGTM! just the doc change below, feel free to remove the label when its ready. I wonder if we should also add this field to the sidecar docs as well?

Comment thread site/content/docs/manifest/lb-web-service.md Outdated
- Name: !Ref WorkloadName
Image: !Ref ContainerImage
{{include "container-definition-base-properties" . | indent 6}}
{{include "envvars" . | indent 10}}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Was there a reason why we didn't include "envvars" to the new template?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

LB web services have the LB URL as an extra environment variable and that adds messy conditionals.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixed in latest commit.

@@ -0,0 +1,13 @@
ContainerDefinitions:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we should take either one of these routes:

  1. Transform this file to container-definitions.yml and include sidecars here.
  2. Or alternatively rename this file to workload-container.yml and move ContainerDefinitions outside of this file so that sidecars.yml and this file ends up being individual elements in the list

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've done 2) in the latest commit.

Copy link
Copy Markdown
Contributor

@iamhopaul123 iamhopaul123 left a comment

Choose a reason for hiding this comment

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

yay lgtm :shipit:

@bvtujo bvtujo removed the do-not-merge Pull requests that mergify shouldn't merge until the requester allows it. label Apr 21, 2021
@mergify mergify Bot merged commit 9ba39f1 into aws:mainline Apr 21, 2021
thrau pushed a commit to localstack/copilot-cli-local that referenced this pull request Dec 9, 2022
<!-- Provide summary of changes -->
Incorporates and builds on top of aws#2165. This addresses @efekarakus' feedback and adds a test. 

<!-- Issue number, if available. E.g. "Fixes aws#31", "Addresses aws#42, 77" -->

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants