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

Improve HandleAdmission resiliency #6284

Merged

Conversation

sslavic
Copy link
Contributor

@sslavic sslavic commented Oct 6, 2020

What this PR does / why we need it:

While testing ingress-nginx v0.40.1 on Kubernetes v1.17.12, with extensions/v1beta1 Ingress, somehow nil ended up being handed over to HandleAdmission, and controller panicked.

2020/10/05 15:50:37 http: panic serving 10.6.1.61:35040: runtime error: invalid memory address or nil pointer dereference
goroutine 344 [running]:
net/http.(*conn).serve.func1(0xc00017ca00)
	net/http/server.go:1801 +0x147
panic(0x1941ce0, 0x28d4200)
	runtime/panic.go:975 +0x3e9
k8s.io/ingress-nginx/internal/admission/controller.(*IngressAdmission).HandleAdmission(0xc000519c10, 0x1d9aa00, 0xc000a21620, 0x600, 0x0, 0x0, 0x0)
	k8s.io/ingress-nginx/internal/admission/controller/main.go:68 +0x91
k8s.io/ingress-nginx/internal/admission/controller.(*AdmissionControllerServer).ServeHTTP(0xc000519c20, 0x1dd23c0, 0xc000102380, 0xc000124900)
	k8s.io/ingress-nginx/internal/admission/controller/server.go:82 +0x24c
net/http.serverHandler.ServeHTTP(0xc000103960, 0x1dd23c0, 0xc000102380, 0xc000124900)
	net/http/server.go:2843 +0xa3
net/http.(*conn).serve(0xc00017ca00, 0x1dd5d40, 0xc0000cdcc0)
	net/http/server.go:1925 +0x8ad
created by net/http.(*Server).Serve
	net/http/server.go:2969 +0x36c

This PR at least makes the controller more resilient. PR also adds a test case that extensions/v1beta1 validation is not supported / gets rejected; migration to networking.k8s.io/v1beta1 or networking.k8s.io/v1 is advised instead.

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)

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.

Signed-off-by: Stevo Slavić <sslavic@gmail.com>
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 6, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @sslavic. 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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 6, 2020
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 6, 2020
@aledbf
Copy link
Member

aledbf commented Oct 6, 2020

/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 Oct 6, 2020
@aledbf
Copy link
Member

aledbf commented Oct 6, 2020

/lgtm
/approve

@aledbf
Copy link
Member

aledbf commented Oct 6, 2020

@sslavic thanks!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, sslavic

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 Oct 6, 2020
@k8s-ci-robot k8s-ci-robot merged commit e541e18 into kubernetes:master Oct 6, 2020
@sslavic sslavic deleted the handle-admission-resiliency branch October 6, 2020 11:50
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants