Merge pull request #3563 from github/mbg/private-registry/oidc

Merge pull request #3563 from github/mbg/private-registry/oidc #6005