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

feat: configurable proxy buffers number #3781

Merged
merged 4 commits into from
Feb 22, 2019

Conversation

zoumo
Copy link

@zoumo zoumo commented Feb 20, 2019

What this PR does / why we need it:
configurable proxy buffers number

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please email the CNCF helpdesk: [email protected]

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 20, 2019
@zoumo
Copy link
Author

zoumo commented Feb 20, 2019

I signed it

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Feb 20, 2019
@ElvinEfendi
Copy link
Member

@zoumo thanks for working on this! Could you also add e2e tests for both configmap and annotation?

@zoumo
Copy link
Author

zoumo commented Feb 21, 2019

@ElvinEfendi Should I change the key from proxy-buffer-number to proxy-buffers-number in both annotation and configmap ?

@zoumo
Copy link
Author

zoumo commented Feb 21, 2019

I have already add e2e tests for annotation in test/e2e/annotations/proxy.go
but I don't known how to add test for configmap

@ElvinEfendi
Copy link
Member

Should I change the key from proxy-buffer-number to proxy-buffers-number in both annotation and configmap ?

Yes, please. proxy-buffers-number sounds more correct.

@ElvinEfendi
Copy link
Member

I have already add e2e tests for annotation in test/e2e/annotations/proxy.go

You are probably referring to https://github.com/kubernetes/ingress-nginx/pull/3781/files#diff-2917c66c2ab6c97e0d327bc77e023176R151. If you delete all your changes in this PR and run that test, it will still pass. You can set it to something other than default value 4 and adjust the assertion at https://github.com/kubernetes/ingress-nginx/pull/3781/files#diff-2917c66c2ab6c97e0d327bc77e023176R162 accordingly then that will be 👍

but I don't known how to add test for configmap

You can take a look at test/e2e/settings/main_snippet.go for an example. But I don't mind if you skip this, we can add it later.

@zoumo zoumo changed the title feat: configurable proxy buffer number feat: configurable proxy buffers number Feb 22, 2019
@zoumo
Copy link
Author

zoumo commented Feb 22, 2019

@ElvinEfendi
I tried to add e2e test for configmap according to the example in test/e2e/settings/main_snippet.go, but I found that there are too many settings missing. So I gave up and left this work to you :)

@@ -546,6 +547,16 @@ To use custom values in an Ingress rule define these annotation:
nginx.ingress.kubernetes.io/proxy-buffering: "on"
```

### Proxy buffers Number

Sets the number of the buffers in [`proxy_buffers`](http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffers) used for reading the first part of the response received from the proxied server.
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 not just about reading the first part, what you're describing proxy_buffer_size

@ElvinEfendi
Copy link
Member

/lgtm
/approve

Thanks @zoumo !

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ElvinEfendi, zoumo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2019
@k8s-ci-robot k8s-ci-robot merged commit 7b24950 into kubernetes:master Feb 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants