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

Commit

Permalink
Merge pull request #1702 from weaveworks/1485-image-pull-secrets
Browse files Browse the repository at this point in the history
Merge existing image credentials into a fresh set
  • Loading branch information
hiddeco authored Feb 4, 2019
2 parents cb43b07 + 284b2a1 commit 8bcf060
Showing 1 changed file with 4 additions and 1 deletion.
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

0 comments on commit 8bcf060

Please sign in to comment.