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

sort auth proxy headers from configmap #4596

Merged
merged 1 commit into from
Sep 24, 2019

Conversation

ElvinEfendi
Copy link
Member

What this PR does / why we need it:

Fixing flaky order dependent test introduced in #4550:

--- FAIL: TestBuildAuthProxySetHeaders (0.00s)
    template_test.go:466: Expected 
        '[proxy_set_header 'header1' 'value1'; proxy_set_header 'header2' 'value2';]'
        but returned 
        '[proxy_set_header 'header2' 'value2'; proxy_set_header 'header1' 'value1';]'
W0924 19:02:38.196548   22128 template.go:120] unexpected error cleaning template: fork/exec /ingress-controller/clean-nginx-conf.sh: no such file or directory

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 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. labels Sep 24, 2019
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2019
@aledbf
Copy link
Member

aledbf commented Sep 24, 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 Sep 24, 2019
@aledbf aledbf removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 24, 2019
@aledbf
Copy link
Member

aledbf commented Sep 24, 2019

@ElvinEfendi is a map, not a list, you need to create an array with the keys, sort that and iterate the sorted list

@ElvinEfendi ElvinEfendi force-pushed the fix-auth-proxy-header-order branch from e6e52d1 to d124dd5 Compare September 24, 2019 19:20
@codecov-io
Copy link

codecov-io commented Sep 24, 2019

Codecov Report

Merging #4596 into master will increase coverage by 1.29%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4596      +/-   ##
==========================================
+ Coverage   58.58%   59.88%   +1.29%     
==========================================
  Files          88       88              
  Lines        6735     7008     +273     
==========================================
+ Hits         3946     4197     +251     
- Misses       2352     2360       +8     
- Partials      437      451      +14
Impacted Files Coverage Δ
internal/ingress/controller/template/template.go 82.78% <100%> (+3.62%) ⬆️
internal/watch/file_watcher.go 80.76% <0%> (-3.85%) ⬇️
internal/ingress/metric/collectors/process.go 90.42% <0%> (+2.12%) ⬆️

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 73bc2cf...d124dd5. Read the comment docs.

@aledbf
Copy link
Member

aledbf commented Sep 24, 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 Sep 24, 2019
@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 merged commit 14f9b0d into kubernetes:master Sep 24, 2019
@ElvinEfendi ElvinEfendi deleted the fix-auth-proxy-header-order branch September 24, 2019 20:31
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants