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

Jump to bottom

connect: fix bug where sidecar_task.resources was ignored with hcl1 #11927

Merged
merged 2 commits into from
Jan 26, 2022
Merged

connect: fix bug where sidecar_task.resources was ignored with hcl1 #11927

merged 2 commits into from
Jan 26, 2022

Conversation

shoenig
Copy link
Member

@shoenig shoenig commented Jan 25, 2022

The HCL1 parser did not respect connect.sidecar_task.resources if the
connect.sidecar_service block was not set (an optimiztion that no longer
makes sense with connect gateways).

Fixes #10899

@vercel vercel bot temporarily deployed to Preview – nomad January 25, 2022 15:37 Inactive
@shoenig shoenig force-pushed the b-hcl1-sidecar_task-resources branch from ec7181c to 2623bb4 Compare January 25, 2022 15:41
@vercel vercel bot temporarily deployed to Preview – nomad January 25, 2022 15:41 Inactive
@shoenig
connect: fix bug where sidecar_task.resources was ignored with hcl1
15442b3 
The HCL1 parser did not respect connect.sidecar_task.resources if the
connect.sidecar_service block was not set (an optimiztion that no longer
makes sense with connect gateways).

Fixes #10899
@shoenig shoenig force-pushed the b-hcl1-sidecar_task-resources branch from 2623bb4 to 15442b3 Compare January 25, 2022 16:18
@vercel vercel bot temporarily deployed to Preview – nomad January 25, 2022 16:18 Inactive
@shoenig shoenig marked this pull request as ready for review January 25, 2022 19:21
@shoenig shoenig requested review from lgfa29 and schmichael January 25, 2022 19:21
lgfa29
lgfa29 approved these changes Jan 26, 2022
View reviewed changes
.changelog/10899.txt Outdated
Comment on lines 1 to 4
```
release-note:bug
Fixed a bug where connect sidecar resources were ignored when using HCL1
```
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
```
release-note:bug
Fixed a bug where connect sidecar resources were ignored when using HCL1
```
```release-note:bug
connect: Fixed a bug where connect sidecar resources were ignored when using HCL1

The filename should also be the PR number 11927.txt

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed!

@vercel vercel bot temporarily deployed to Preview – nomad January 26, 2022 12:32 Inactive
@shoenig shoenig merged commit 4ca4335 into main Jan 26, 2022
@shoenig shoenig deleted the b-hcl1-sidecar_task-resources branch January 26, 2022 12:32
@komapa
Copy link

komapa commented Mar 8, 2022

Hello @shoenig, this bugfix was marked for back-porting into 1.1 but unfortunately the latest 1.1.12 does not include your fix here. Do you know if this was deliberate omission or just the backporting did not happen by mistake? Thanks!

@shoenig
Copy link
Member Author

shoenig commented Mar 8, 2022

Hi @kirooshu, we just haven't shipped a release yet (v1.3 is coming soon) since fixing this bug. Once we do it'll also be backported into 1.1.x and 1.2.x at the same time.

lgfa29 added a commit that referenced this pull request Apr 14, 2022
@lgfa29
changelog: fix entry for #11927
7c6c67b
@lgfa29 lgfa29 added stage/needs-backporting backport/1.1.x backport to 1.1.x release line backport/1.2.x backport to 1.1.x release line labels Apr 14, 2022
This was referenced Apr 19, 2022
Merged
Merged
lgfa29 added a commit that referenced this pull request Apr 19, 2022
@lgfa29
changelog: fix entry for #11927 (#12577)
2319a08
@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lgfa29 lgfa29 lgfa29 approved these changes

@schmichael schmichael Awaiting requested review from schmichael

Assignees
No one assigned
Labels
backport/1.1.x backport to 1.1.x release line backport/1.2.x backport to 1.1.x release line
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Connect Gateways: Resources are not respected/supported
3 participants
@shoenig @komapa @lgfa29