Skip to content

Avoid using a global registry client when downloading OCI helm charts #3938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2025
Merged

Avoid using a global registry client when downloading OCI helm charts #3938

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 10 additions & 20 deletions internal/bundlereader/loaddirectory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,6 @@ import (
"helm.sh/helm/v3/pkg/registry"
)

var (
registryClient *registry.Client

fleetOciProvider = helmgetter.Provider{
Schemes: []string{registry.OCIScheme},
New: NewFleetOCIProvider,
}
)

func NewFleetOCIProvider(options ...helmgetter.Option) (helmgetter.Getter, error) {
if registryClient == nil {
return nil, fmt.Errorf("oci registry client is nil")
}

return helmgetter.NewOCIGetter(helmgetter.WithRegistryClient(registryClient))
}

// ignoreTree represents a tree of ignored paths (read from .fleetignore files), each node being a directory.
// It provides a means for ignored paths to be propagated down the tree, but not between subdirectories of a same
// directory.
Expand Down Expand Up @@ -363,7 +346,7 @@ func downloadOCIChart(name, version, path string, auth Auth) (string, error) {
if auth.BasicHTTP {
clientOptions = append(clientOptions, registry.ClientOptPlainHTTP())
}
registryClient, err = registry.NewClient(clientOptions...)
registryClient, err := registry.NewClient(clientOptions...)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -394,8 +377,15 @@ func downloadOCIChart(name, version, path string, auth Auth) (string, error) {
getterOptions = append(getterOptions, helmgetter.WithInsecureSkipVerifyTLS(auth.InsecureSkipVerify))

c := downloader.ChartDownloader{
Verify: downloader.VerifyNever,
Getters: helmgetter.Providers{fleetOciProvider},
Verify: downloader.VerifyNever,
Getters: helmgetter.Providers{
helmgetter.Provider{
Schemes: []string{registry.OCIScheme},
New: func(options ...helmgetter.Option) (helmgetter.Getter, error) {
return helmgetter.NewOCIGetter(helmgetter.WithRegistryClient(registryClient))
},
},
},
RegistryClient: registryClient,
Options: getterOptions,
}
Expand Down
Loading