Merge pull request #340 from scothis/preserve-keychain

Avoid overwriting user defined registry options
carvel-dev · Feb 22, 2022 · 909c67d · 909c67d
2 parents 8025345 + c3de94a
commit 909c67d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/imgpkg/registry/registry.go b/pkg/imgpkg/registry/registry.go
@@ -157,7 +157,8 @@ func (r SimpleRegistry) CloneWithSingleAuth(imageRef regname.Tag) (Registry, err
 
 // opts Returns the opts + the keychain
 func (r SimpleRegistry) opts() []regremote.Option {
-	return append(r.remoteOpts, regremote.WithAuthFromKeychain(r.keychain))
+	// new options come first so that user configured options take precedence
+	return append([]regremote.Option{regremote.WithAuthFromKeychain(r.keychain)}, r.remoteOpts...)
 }
 
 // Get Retrieve Image descriptor for an Image reference