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

Upstream keepalive time #8319

Merged
merged 8 commits into from
Apr 15, 2022
Merged

Upstream keepalive time #8319

merged 8 commits into from
Apr 15, 2022

Conversation

sskserk
Copy link
Contributor

@sskserk sskserk commented Mar 9, 2022 •
edited
Loading

What this PR does / why we need it:

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Mar 9, 2022
@k8s-ci-robot
Copy link
Contributor

@sskserk: This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot
Copy link
Contributor

Hi @sskserk. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 9, 2022
@sskserk
Copy link
Contributor Author

sskserk commented Mar 9, 2022

/draft

@sskserk sskserk marked this pull request as draft March 9, 2022 14:58
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 9, 2022
@sskserk sskserk force-pushed the upstream_keepalive_time branch 11 times, most recently from 8213394 to 51b5835 Compare March 10, 2022 11:11
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 10, 2022
@sskserk sskserk force-pushed the upstream_keepalive_time branch 2 times, most recently from 47ce61f to 770fd7c Compare March 10, 2022 11:47
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 10, 2022
@sskserk sskserk marked this pull request as draft March 31, 2022 09:49
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 31, 2022
@sskserk sskserk marked this pull request as ready for review April 1, 2022 13:08
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 1, 2022
@k8s-ci-robot k8s-ci-robot requested a review from rikatz April 1, 2022 13:08
@sskserk sskserk requested a review from strongjz April 1, 2022 13:09
@rikatz
Copy link
Contributor

rikatz commented Apr 12, 2022

Please add e2e tests for this in test/e2e/settings/keep-alive.go

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 13, 2022
@sskserk
Copy link
Contributor Author

sskserk commented Apr 13, 2022

Please add e2e tests for this in test/e2e/settings/keep-alive.go

done

rikatz
rikatz suggested changes Apr 13, 2022
View reviewed changes
test/e2e/settings/keep-alive.go Outdated
@@ -74,6 +74,15 @@ var _ = framework.DescribeSetting("keep-alive keep-alive-requests", func() {
})
})

ginkgo.It("should set keepalive time to upstream server", func() {
f.UpdateNginxConfigMapData("upstream-keepalive-time", "1h")
Copy link
Contributor

Choose a reason for hiding this comment

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

Promise, last comment. Dont use the default value to check if this works.

Set a different value so we can see the configmap reflecting on the config

rikatz
rikatz approved these changes Apr 13, 2022
View reviewed changes
Copy link
Contributor

@rikatz rikatz left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/hold
Hold the CI :)

Thanks!

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 13, 2022
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 13, 2022
tao12345666333
tao12345666333 approved these changes Apr 15, 2022
View reviewed changes
Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

/lgtm
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 15, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz, sskserk, tao12345666333

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

@iamNoah1
Copy link
Contributor

/hold-cancel
:)

@iamNoah1
Copy link
Contributor

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 15, 2022
@iamNoah1
Copy link
Contributor

/hold cancel

@k8s-ci-robot k8s-ci-robot merged commit d4b9b48 into kubernetes:main Apr 15, 2022
rchshld pushed a commit to joomcode/ingress-nginx that referenced this pull request May 19, 2023
@sskserk @rchshld
Upstream keepalive time (kubernetes#8319)
a150ba7 
* nginx 1.19.10 keepalive_time parameter

* nginx v1.19.10 base image

* keepalive_time documentation

* base image

* restore base image

* e2e test

* replace default value in test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tao12345666333 tao12345666333 tao12345666333 approved these changes

@rikatz rikatz rikatz approved these changes

@bowei bowei Awaiting requested review from bowei

@ElvinEfendi ElvinEfendi Awaiting requested review from ElvinEfendi

@strongjz strongjz Awaiting requested review from strongjz

Assignees

@tao12345666333 tao12345666333

@rikatz rikatz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/docs 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. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@sskserk @k8s-ci-robot @rikatz @iamNoah1 @strongjz @tao12345666333