Skip to content

backport: xds: use federation env var to guard new-style resource name parsing (#29725)#29727

Merged
markdroth merged 1 commit intogrpc:v1.46.xfrom
markdroth:xds_federation_env_var_fix
May 19, 2022
Merged

backport: xds: use federation env var to guard new-style resource name parsing (#29725)#29727
markdroth merged 1 commit intogrpc:v1.46.xfrom
markdroth:xds_federation_env_var_fix

Conversation

@markdroth
Copy link
Copy Markdown
Member

We'll need to cut a new 1.46 patch release with this fix.

@markdroth markdroth added the release notes: no Indicates if PR should not be in release notes label May 18, 2022
@markdroth markdroth requested a review from lidizheng May 18, 2022 22:17
@markdroth markdroth merged commit 9369226 into grpc:v1.46.x May 19, 2022
@markdroth markdroth deleted the xds_federation_env_var_fix branch May 19, 2022 14:05
gnossen added a commit that referenced this pull request May 19, 2022
* Bump release version to v1.46.0-pre1 (#29415)

* bump version to 1.46.0-pre1

* regenerate projects

* PSM Security: Increase test timeout to 240 for C++ and Python (#29420) (#29421)

* [1.46][fault-injection] Backport fix for fault injection filter #29467

Backports #29288

* Bump release version to v1.46.0-pre2 (#29471)

* bump version to 1.46.0-pre2

* regenerate projects

* Upgrading zlib. (#29533)

CVE-2018-25032

* Revert "Enable authz_test for C++ and Python (#29147)" (#29556)

This reverts commit 02bddf2.

* Bump release version to v1.46.0 (#29565)

* bump version to 1.46.0

* regenerate projects

* Downgrade io_bazel_rules_go to v0.27.0 restore Bazel 3.x support (#29596) (#29602)

* Bump version to v1.46.1 (#29606)

* Bump version to v1.46.1

* Bump version in BUILD as well

* Fix #24421: UnobservedTaskException when server Unavailable (C# on v1.46.x branch) (#29582)

* fix #24421

* add test for #24421

* Upgrade ruby rake-compiler-dock images (#29304) (#29657)

* Upgrade rake-compiler-dock images

* [Ruby]fix a rake compile error since rake-compiler ~> 1.1 (#28666) (#29656)

* fix a rake compile error since rake-compiler ~> 1.1

* change File.directory? check

Co-authored-by: Hannah Shi <hannahshisfb@gmail.com>

* Bump version 1.46.2 (#29661)

* Bump version to 1.46.2

* Regenerate projects

* use internal release_open_source.py script to commit changes and create PR (#29698)

* xds: use federation env var to guard new-style resource name parsing (#29725) (#29727)

* Re-add authz tests on master

* Re-add C# dependencies.props

Co-authored-by: Lidi Zheng <lidiz@google.com>
Co-authored-by: Yash Tibrewal <yashkt@google.com>
Co-authored-by: Craig Tiller <ctiller@google.com>
Co-authored-by: Nicolas Noble <nicolasnoble@users.noreply.github.com>
Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
Co-authored-by: apolcyn <apolcyn@google.com>
Co-authored-by: Hannah Shi <hannahshisfb@gmail.com>
Co-authored-by: Mark D. Roth <roth@google.com>
lidizheng added a commit to lidizheng/grpc that referenced this pull request May 24, 2022
* Bump release version to v1.46.0-pre1 (grpc#29415)

* bump version to 1.46.0-pre1

* regenerate projects

* PSM Security: Increase test timeout to 240 for C++ and Python (grpc#29420) (grpc#29421)

* [1.46][fault-injection] Backport fix for fault injection filter grpc#29467

Backports grpc#29288

* Bump release version to v1.46.0-pre2 (grpc#29471)

* bump version to 1.46.0-pre2

* regenerate projects

* Upgrading zlib. (grpc#29533)

CVE-2018-25032

* Revert "Enable authz_test for C++ and Python (grpc#29147)" (grpc#29556)

This reverts commit 02bddf2.

* Bump release version to v1.46.0 (grpc#29565)

* bump version to 1.46.0

* regenerate projects

* Downgrade io_bazel_rules_go to v0.27.0 restore Bazel 3.x support (grpc#29596) (grpc#29602)

* Bump version to v1.46.1 (grpc#29606)

* Bump version to v1.46.1

* Bump version in BUILD as well

* Fix grpc#24421: UnobservedTaskException when server Unavailable (C# on v1.46.x branch) (grpc#29582)

* fix grpc#24421

* add test for grpc#24421

* Upgrade ruby rake-compiler-dock images (grpc#29304) (grpc#29657)

* Upgrade rake-compiler-dock images

* [Ruby]fix a rake compile error since rake-compiler ~> 1.1 (grpc#28666) (grpc#29656)

* fix a rake compile error since rake-compiler ~> 1.1

* change File.directory? check

Co-authored-by: Hannah Shi <hannahshisfb@gmail.com>

* Bump version 1.46.2 (grpc#29661)

* Bump version to 1.46.2

* Regenerate projects

* use internal release_open_source.py script to commit changes and create PR (grpc#29698)

* xds: use federation env var to guard new-style resource name parsing (grpc#29725) (grpc#29727)

* Re-add authz tests on master

* Re-add C# dependencies.props

Co-authored-by: Lidi Zheng <lidiz@google.com>
Co-authored-by: Yash Tibrewal <yashkt@google.com>
Co-authored-by: Craig Tiller <ctiller@google.com>
Co-authored-by: Nicolas Noble <nicolasnoble@users.noreply.github.com>
Co-authored-by: Jan Tattermusch <jtattermusch@google.com>
Co-authored-by: apolcyn <apolcyn@google.com>
Co-authored-by: Hannah Shi <hannahshisfb@gmail.com>
Co-authored-by: Mark D. Roth <roth@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants