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 undefined variable $auth_cookie error due to when location is denied #5664

Merged
merged 1 commit into from
Jun 8, 2020

Conversation

jeffistyping
Copy link
Contributor

Added isLocationAllowed check before using the $auth_cookie variable in nginx.tmpl.

What this PR does / why we need it:

As described in #5130, a new reference to $auth_cookie variable does not get declared when location is denied. As a result, an Undefined Nginx variable "$auth_cookie" occurs preventing the config to be loaded properly.

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 #5130

How Has This Been Tested?

Added an e2e test that starts a controller, installs an ingress with incorrect annotation, and then deploys another ingress and asserts that the new ingress is reflected in the Nginx configuration.

No new unit tests are needed.

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 5, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @jeffrey-hui. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 5, 2020
@aledbf
Copy link
Member

aledbf commented Jun 5, 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 Jun 5, 2020
@aledbf
Copy link
Member

aledbf commented Jun 5, 2020

/assign @ElvinEfendi

@codecov-commenter
Copy link

codecov-commenter commented Jun 5, 2020

Codecov Report

Merging #5664 into master will increase coverage by 0.24%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5664      +/-   ##
==========================================
+ Coverage   58.48%   58.72%   +0.24%     
==========================================
  Files          88       88              
  Lines        6975     6946      -29     
==========================================
  Hits         4079     4079              
+ Misses       2446     2417      -29     
  Partials      450      450              
Impacted Files Coverage Δ
internal/ingress/controller/nginx.go 30.00% <0.00%> (+0.27%) ⬆️
internal/ingress/controller/process/nginx.go 100.00% <ø> (+67.64%) ⬆️

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 99aad29...7767230. Read the comment docs.

@jeffistyping jeffistyping changed the title fix undefined variable $auth_cookie due to annotation error fix undefined variable $auth_cookie error due to when location is denied Jun 5, 2020
@jeffistyping jeffistyping marked this pull request as ready for review June 5, 2020 15:36
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 5, 2020
@aledbf
Copy link
Member

aledbf commented Jun 5, 2020

/retest

@ElvinEfendi
Copy link
Member

/test pull-ingress-nginx-e2e-1-16

@jeffistyping
Copy link
Contributor Author

/retest

@jeffistyping
Copy link
Contributor Author

/test pull-ingress-nginx-e2e-1-16

(add) isLocationAllowed check before setting the cookie
@aledbf
Copy link
Member

aledbf commented Jun 8, 2020

/retest

1 similar comment
@aledbf
Copy link
Member

aledbf commented Jun 8, 2020

/retest

@ElvinEfendi
Copy link
Member

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ElvinEfendi, jeffrey-hui

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 8, 2020
@k8s-ci-robot k8s-ci-robot merged commit 1ecc0b3 into kubernetes:master Jun 8, 2020
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/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.

Undefined Nginx variable "$auth_cookie" when location is denied
5 participants