Skip to content

Fix different registry hosts referencing the same auth config.#5446

Merged
mikebrow merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-auth-config
May 4, 2021
Merged

Fix different registry hosts referencing the same auth config.#5446
mikebrow merged 1 commit intocontainerd:masterfrom
Random-Liu:fix-auth-config

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

Fixes #5330.

Signed-off-by: Lantao Liu [email protected]

@Random-Liu
Copy link
Copy Markdown
Member Author

/cc @mikebrow

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented May 4, 2021

Build succeeded.

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread pkg/cri/server/image_pull.go
@mikebrow mikebrow merged commit c1a3523 into containerd:master May 4, 2021
mikebrow added a commit to mikebrow/containerd that referenced this pull request May 4, 2021
@Random-Liu Random-Liu deleted the fix-auth-config branch May 4, 2021 16:57
AkihiroSuda added a commit that referenced this pull request May 6, 2021
vendoring in cherry pick #5446 from v1.4 CRI release for next 1.4 service refresh
estesp added a commit that referenced this pull request May 12, 2021
@thaJeztah thaJeztah added cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch and removed cherry-pick/1.5.x labels Jul 20, 2021
@thaJeztah
Copy link
Copy Markdown
Member

Looks to have been cherry-picked through #5449

@thaJeztah thaJeztah added cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch and removed cherry-pick/1.4.x labels Jul 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/cri Container Runtime Interface (CRI) cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Failed to pull from second or third registry mirror if registry mirrors have different auth

3 participants