Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Merge existing image credentials into a fresh set #1702

Merged
merged 1 commit into from
Feb 4, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cluster/kubernetes/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ func (c *Cluster) ImagesToFetch() registry.ImageCreds {
for imageID, creds := range imageCreds {
existingCreds, ok := allImageCreds[imageID]
if ok {
existingCreds.Merge(creds)
mergedCreds := registry.NoCredentials()
mergedCreds.Merge(existingCreds)
mergedCreds.Merge(creds)
allImageCreds[imageID] = mergedCreds
} else {
allImageCreds[imageID] = creds
}
Expand Down