Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

• The toolchain has been rebuilt successfully (or no changes were made to it)
• The toolchain/worker package manifests are up-to-date
• Any updated packages successfully build (or no packages were changed)
• Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
• Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
• All package sources are available
• cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
• LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
• All source files have up-to-date hashes in the *.signatures.json files
• sudo make go-tidy-all and sudo make go-test-coverage pass
• Documentation has been updated to match any changes to the build system
• Ready to merge

Summary

What does the PR accomplish, why was it needed?

• Backports a fix for a credential leak vulnerability in containerd2's CRI error handling. When image pulls fail from private registries using URL-based authentication (e.g., Azure Blob Storage with SAS tokens), sensitive query parameters were being exposed in both containerd logs and Kubernetes pod events (visible via kubectl describe pod).

Change Log

• Adds fix-credential-leak-in-cri-errors.patch containing two upstream commits:
  • Initial fix to redact query parameters in CRI error logs - containerd/containerd@3e2cee2
  • Follow-up fix to sanitize errors before gRPC return to prevent credential leak in pod events - containerd/containerd@7b11d6c
• Bumps release to 2.0.0-17

Does this affect the toolchain?

NO

Associated issues

• Error messages returned from registries should hide sensitive information containerd/containerd#5453

Test Methodology

• Buddy build Pass
• Tested the containerd fix on an AKS cluster running Azure Linux 3.0. Created an image pull failure scenario by blocking blob storage IPs with iptables REJECT rules, then deployed a pod referencing an ACR image. Both kubectl describe pod events and journalctl -u containerd logs show all SAS token query parameters properly replaced with [REDACTED]. The fix successfully prevents credential exposure in error messages when image pulls fail.
• Ran the pre-release AKS tests