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

Fix crash due to missing ingress http block #831

Merged

Conversation

ebabani
Copy link

@ebabani ebabani commented Jul 18, 2019

It's acceptable although uncommon for an ingress to have a rule and a host,
but no HTTP block for that particular rule.

What this PR does / why we need it:
Fixes a crash when an ingress exists with rules but no HTTP block.

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

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 18, 2019
@tariq1890
Copy link
Contributor

Thanks for the fix @ebabani . @brancz This is definitely a bug fix. Do you think we should backport this to release 1.7 and release 1.6?

@brancz
Copy link
Member

brancz commented Jul 18, 2019

I'm thinking 1.7 only, #830 looks like a candidate for a v1.7.1 as well

@tariq1890
Copy link
Contributor

Fine with me. I'll retarget this PR.

@tariq1890 tariq1890 changed the base branch from master to release-1.7 July 18, 2019 19:12
@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 Jul 18, 2019
@tariq1890
Copy link
Contributor

@ebabani Can you rebase this PR against the release-1.7 branch?

@tariq1890
Copy link
Contributor

tariq1890 commented Jul 18, 2019

/hold

Putting the PR on hold until it's rebased.

@tariq1890 tariq1890 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2019
@ebabani
Copy link
Author

ebabani commented Jul 18, 2019

This does not need to be backported to 1.6.x, these metrics were first added in 1.7. I'll rebase the PR

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 18, 2019
@ebabani
Copy link
Author

ebabani commented Jul 18, 2019

/assign @brancz

@tariq1890
Copy link
Contributor

I still see non-release commits from the master branch in this PR. Can you fix that?

@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 Jul 18, 2019
@ebabani
Copy link
Author

ebabani commented Jul 18, 2019

Very odd, but should be fixed now. Sorry about that @tariq1890

Copy link
Contributor

@tariq1890 tariq1890 left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks @ebabani !

@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 Jul 18, 2019
@tariq1890
Copy link
Contributor

I will wait on @brancz for final approval :).

internal/store/ingress.go Outdated Show resolved Hide resolved
It's acceptable although uncommon for an ingress to have a rule and a host,
but no HTTP block for that particular rule.
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2019
@brancz
Copy link
Member

brancz commented Jul 18, 2019

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brancz, ebabani, tariq1890

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

@tariq1890 tariq1890 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 18, 2019
@k8s-ci-robot k8s-ci-robot merged commit e8bfc3e into kubernetes:release-1.7 Jul 18, 2019
@tariq1890 tariq1890 mentioned this pull request Jul 18, 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/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.

None yet

4 participants