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.

Sign up for GitHub

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

Jump to bottom

Legacy cherrypick #7925

Merged
merged 4 commits into from
Nov 16, 2021
Merged

Legacy cherrypick #7925

merged 4 commits into from
Nov 16, 2021

Conversation

rikatz
Copy link
Contributor

@rikatz rikatz commented Nov 16, 2021

Cherry-pick of multiple patches to legacy branch:

ctron and others added 3 commits November 15, 2021 22:32
@ctron @rikatz
fix: fix thread synchronization issue kubernetes#6245 (kubernetes#7800)
2205718
@rikatz
Add option to sanitize annotation inputs (kubernetes#7874)
f9350d5 
* Add option to sanitize annotation inputs

* Fix e2e tests after string sanitization

* Add proxy_pass and serviceaccount as denied values
@rikatz
Trim spaces from badword items (kubernetes#7921)
ec20b86
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 16, 2021
@k8s-ci-robot
Copy link
Contributor

@rikatz: This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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-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. needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 16, 2021
@k8s-ci-robot k8s-ci-robot added area/docs approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 16, 2021
iamNoah1
iamNoah1 reviewed Nov 16, 2021
View reviewed changes
Copy link
Contributor

@iamNoah1 iamNoah1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/retest

test/e2e/admission/admission.go Outdated
assert.NotNil(ginkgo.GinkgoT(), err, "creating an ingress with invalid annotation value should return an error")
})

ginkgo.It("should not return an error if the Ingress V1 definition is valid with Ingress Class", func() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one fails, gonna rerun

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, something weird happened on the cherrypick...

@iamNoah1
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamNoah1, 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:

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 b159577 into kubernetes:legacy Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iamNoah1 iamNoah1 iamNoah1 left review comments

@strongjz strongjz Awaiting requested review from strongjz

@tao12345666333 tao12345666333 Awaiting requested review from tao12345666333

Assignees

@iamNoah1 iamNoah1

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/docs 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. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rikatz @k8s-ci-robot @iamNoah1 @ctron