Append elements on match, instead of removing for cors-annotations #8185

L1ghtman2k · 2022-01-25T20:37:09Z

What this PR does / why we need it:

fixes #8168

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)
Documentation only

Which issue/s this PR fixes

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 · 2022-01-25T20:37:12Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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. I understand the commands that are listed here.

linux-foundation-easycla · 2022-01-25T20:37:12Z

The committers are authorized under a signed CLA.

✅ Aibek (94870b8)

k8s-ci-robot · 2022-01-25T20:37:17Z

Welcome @L1ghtman2k!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2022-01-25T20:37:17Z

Hi @L1ghtman2k. 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.

L1ghtman2k · 2022-01-26T17:50:34Z

I signed it

internal/ingress/annotations/cors/main.go

iamNoah1 · 2022-01-27T08:53:07Z

/triage accepted
/priority important-soon
/kind bug

iamNoah1

/ok-to-test

larivierec · 2022-01-27T12:48:54Z

internal/ingress/annotations/cors/main.go

 				klog.Errorf("Error parsing cors-allow-origin parameters. Supplied incorrect origin: %s. Skipping.", origin)
-				config.CorsAllowOrigin = append(config.CorsAllowOrigin[:i], config.CorsAllowOrigin[i+1:]...)
 			}
 			klog.Infof("Current config.corsAllowOrigin %v", config.CorsAllowOrigin)


this has nothing to do with the review (nice catch)
we could change this to the current origin instead of the whole list as well.

just a thought

I might be misinterpreting, but that was adjusted in this commit to use the current origin:
config.CorsAllowOrigin = append(config.CorsAllowOrigin, origin)

probably, i'm referring to this here: klog.Infof("Current config.corsAllowOrigin %v", config.CorsAllowOrigin) sorry about that :)

rikatz · 2022-02-13T18:34:50Z

/lgtm
/approve
Thanks

k8s-ci-robot · 2022-02-13T18:35:23Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: L1ghtman2k, rikatz

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:

~~OWNERS~~ [rikatz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

…ubernetes#8185) * fixes kubernetes#8168 by appending elements on match, instead of removing * refactor the corsOriginRegex comparison, and initialize CorsAllowOrigin

fixes #8168 by appending elements on match, instead of removing

94870b8

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 25, 2022

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 25, 2022

k8s-ci-robot requested review from ElvinEfendi and tao12345666333 January 25, 2022 20:37

L1ghtman2k changed the title ~~fixes https://github.com/kubernetes/ingress-nginx/issues/8168 by appending elements on match, instead of removing~~ Append elements on match, instead of removing for cors-annotations Jan 25, 2022

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jan 26, 2022

rikatz requested changes Jan 27, 2022

View reviewed changes

internal/ingress/annotations/cors/main.go Outdated Show resolved Hide resolved

refactor the corsOriginRegex comparison, and initialize CorsAllowOrigin

25c8241

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 27, 2022

iamNoah1 reviewed Jan 27, 2022

View reviewed changes

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jan 27, 2022

k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 27, 2022

larivierec reviewed Jan 27, 2022

View reviewed changes

k8s-ci-robot assigned rikatz Feb 13, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 13, 2022

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 13, 2022

k8s-ci-robot merged commit 5754eb6 into kubernetes:main Feb 13, 2022

tao12345666333 mentioned this pull request Feb 27, 2022

v1.1.2 Release #8274

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Append elements on match, instead of removing for cors-annotations #8185

Append elements on match, instead of removing for cors-annotations #8185

L1ghtman2k commented Jan 25, 2022 •

edited

Loading

k8s-ci-robot commented Jan 25, 2022

linux-foundation-easycla bot commented Jan 25, 2022 •

edited

Loading

k8s-ci-robot commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

L1ghtman2k commented Jan 26, 2022

iamNoah1 commented Jan 27, 2022

iamNoah1 left a comment

larivierec Jan 27, 2022 •

edited

Loading

L1ghtman2k Jan 27, 2022 •

edited

Loading

larivierec Jan 27, 2022

rikatz commented Feb 13, 2022

k8s-ci-robot commented Feb 13, 2022

Append elements on match, instead of removing for cors-annotations #8185

Append elements on match, instead of removing for cors-annotations #8185

Conversation

L1ghtman2k commented Jan 25, 2022 • edited Loading

What this PR does / why we need it:

Types of changes

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

k8s-ci-robot commented Jan 25, 2022

linux-foundation-easycla bot commented Jan 25, 2022 • edited Loading

k8s-ci-robot commented Jan 25, 2022

k8s-ci-robot commented Jan 25, 2022

L1ghtman2k commented Jan 26, 2022

iamNoah1 commented Jan 27, 2022

iamNoah1 left a comment

Choose a reason for hiding this comment

larivierec Jan 27, 2022 • edited Loading

Choose a reason for hiding this comment

L1ghtman2k Jan 27, 2022 • edited Loading

Choose a reason for hiding this comment

larivierec Jan 27, 2022

Choose a reason for hiding this comment

rikatz commented Feb 13, 2022

k8s-ci-robot commented Feb 13, 2022

L1ghtman2k commented Jan 25, 2022 •

edited

Loading

linux-foundation-easycla bot commented Jan 25, 2022 •

edited

Loading

larivierec Jan 27, 2022 •

edited

Loading

L1ghtman2k Jan 27, 2022 •

edited

Loading