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 proxy_protocol duplication in listen definition #5684

Merged
merged 1 commit into from
Jun 9, 2020

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Jun 9, 2020

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)

Which issue/s this PR fixes

fixes #5680

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 9, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf

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 Jun 9, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #5684 into master will increase coverage by 0.26%.
The diff coverage is 57.89%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5684      +/-   ##
==========================================
+ Coverage   58.48%   58.74%   +0.26%     
==========================================
  Files          88       88              
  Lines        6975     6943      -32     
==========================================
  Hits         4079     4079              
+ Misses       2446     2416      -30     
+ Partials      450      448       -2     
Impacted Files Coverage Δ
internal/ingress/controller/nginx.go 30.00% <0.00%> (+0.27%) ⬆️
internal/ingress/controller/process/nginx.go 100.00% <ø> (+67.64%) ⬆️
internal/ingress/controller/template/template.go 79.73% <61.11%> (+0.05%) ⬆️
internal/ingress/metric/collectors/process.go 90.62% <0.00%> (+2.08%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 928ea08...c8b58d3. Read the comment docs.

@aledbf
Copy link
Member Author

aledbf commented Jun 9, 2020

/retest

1 similar comment
@aledbf
Copy link
Member Author

aledbf commented Jun 9, 2020

/retest

@aledbf aledbf merged commit 3d3efaa into kubernetes:master Jun 9, 2020
@aledbf aledbf deleted the proxy branch June 9, 2020 20:47
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. 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.

Duplicated proxy_protocol directive for HTTPS Listener
3 participants