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.

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

Backport of [NET-6465] Respect connectInject.initContainer.resources for v1 API gateways into release/1.2.x #3561

Conversation

hc-github-team-consul-core
Copy link
Collaborator

@hc-github-team-consul-core hc-github-team-consul-core commented Feb 6, 2024

Backport

This PR is manually generated from #3531 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

The below text is copied from the body of the original PR.


Changes proposed in this PR

Apply the existing connectInject.initContainer.resources value to the init container for API gateway Pods.

How I've tested this PR

Create an API Gateway having installed Consul into Kubernetes w/ the above field set in your values.yaml.

How I expect reviewers to test this PR

See above

Checklist


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 6, 2024

CLA assistant check
All committers have signed the CLA.

…ateways (#3531)

* Respect connectInject.initContainer.resources for v1 API gateways

* Add changelog entry

* Add test coverage for init container resources on API gateway Pods
@nathancoleman nathancoleman force-pushed the backport/v1-api-gw-init-resources/informally-winning-dane branch from 6076640 to f88512a Compare February 6, 2024 22:57
@nathancoleman nathancoleman marked this pull request as ready for review February 6, 2024 22:57
@@ -537,6 +537,7 @@ func (c *Command) Run(args []string) int {
ConsulTLSServerName: c.consul.TLSServerName,
ConsulPartition: c.consul.Partition,
ConsulCACert: string(caCertPem),
InitContainerResources: &initResources,
Copy link
Member

Choose a reason for hiding this comment

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

This is the only difference from the source PR that is being backported. The structure of this file changed drastically between 1.2.x and 1.3.x

@nathancoleman nathancoleman enabled auto-merge (squash) February 7, 2024 00:55
@nathancoleman nathancoleman merged commit 73f645c into release/1.2.x Feb 7, 2024
40 of 45 checks passed
@nathancoleman nathancoleman deleted the backport/v1-api-gw-init-resources/informally-winning-dane branch February 7, 2024 16:48
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.

4 participants