Skip to content

[master] August 2021 security patches#34864

Merged
istio-testing merged 4 commits intoistio:masterfrom
jacob-delgado:merge-aug-2021-security
Sep 10, 2021
Merged

[master] August 2021 security patches#34864
istio-testing merged 4 commits intoistio:masterfrom
jacob-delgado:merge-aug-2021-security

Conversation

@jacob-delgado
Copy link
Copy Markdown
Contributor

Merge in release-1.11.1-patch into master

@google-cla google-cla bot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Aug 25, 2021
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 25, 2021
@jacob-delgado
Copy link
Copy Markdown
Contributor Author

cc @myidpt @yangminzhu

Patch depends on istio/proxy#3460 being merged in due to Envoy changes.

@jacob-delgado jacob-delgado added the lifecycle/staleproof Indicates a PR or issue has been deemed to be immune from becoming stale and/or automatically closed label Aug 25, 2021
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an unintended merge conflict

@sergii-ssh
Copy link
Copy Markdown
Contributor

/retest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we should use the new API in master fix, see the https://github.com/istio-private/istio/pull/71 for the fix, you can probably just cherry-pick it (it may have a little bit code conflict but should be easy to resolve).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Cherry picked the old version

@jacob-delgado jacob-delgado requested a review from a team as a code owner September 9, 2021 20:04
@istio-testing istio-testing added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 9, 2021
@jacob-delgado jacob-delgado added the release-notes-none Indicates a PR that does not require release notes. label Sep 9, 2021
@jacob-delgado
Copy link
Copy Markdown
Contributor Author

/test release-notes_istio

Copy link
Copy Markdown
Contributor

@yangminzhu yangminzhu left a comment

Choose a reason for hiding this comment

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

looks great, thanks for the change!

@istio-testing istio-testing merged commit 39e3859 into istio:master Sep 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. lifecycle/staleproof Indicates a PR or issue has been deemed to be immune from becoming stale and/or automatically closed release-notes-none Indicates a PR that does not require release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants