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 wrong config generation when upstream-hash-by is set #2215

Merged
merged 1 commit into from Mar 19, 2018

Conversation

ElvinEfendi
Copy link
Member

@ElvinEfendi ElvinEfendi commented Mar 19, 2018

What this PR does / why we need it:
fixes incorrect config generation when upstream-hash-by is set.

An incorrectly generated config looks like:

    upstream squawk-production-squawk-web-80 {
        hash {{ $upstream.UpstreamHashBy }} consistent;

        keepalive 32;

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 k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 19, 2018
@codecov-io
Copy link

Codecov Report

Merging #2215 into master will increase coverage by 0.14%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2215      +/-   ##
==========================================
+ Coverage   36.98%   37.12%   +0.14%     
==========================================
  Files          70       70              
  Lines        4978     4978              
==========================================
+ Hits         1841     1848       +7     
+ Misses       2857     2851       -6     
+ Partials      280      279       -1
Impacted Files Coverage Δ
internal/ingress/controller/template/template.go 64.33% <0%> (ø) ⬆️
cmd/nginx/main.go 26.2% <0%> (+4.82%) ⬆️

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 08252e2...f53dfe5. Read the comment docs.

@aledbf
Copy link
Member

aledbf commented Mar 19, 2018

/approve

@aledbf
Copy link
Member

aledbf commented Mar 19, 2018

@ElvinEfendi thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Mar 19, 2018
@aledbf aledbf merged commit df50487 into kubernetes:master Mar 19, 2018
@aledbf aledbf added this to done in 0.13.0 Mar 19, 2018
@ElvinEfendi ElvinEfendi deleted the bug-fix branch March 19, 2018 22:52
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants