HELM_REGISTRY_CONFIG: change default file of registry config to confi…

…g.json Changes default registry config file from `registry.json` to `config.json`. This aligns with the `config.json` that is widely used in docker. Closes: #10156 Related: #10122 Signed-off-by: Allen Bai <abai@redhat.com>
helm · Jan 11, 2022 · e08a927 · e08a927
1 parent 46aa53a
commit e08a927
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/experimental/registry/constants.go b/internal/experimental/registry/constants.go
@@ -21,7 +21,7 @@ const (
 	OCIScheme = "oci"
 
 	// CredentialsFileBasename is the filename for auth credentials file
-	CredentialsFileBasename = "registry.json"
+	CredentialsFileBasename = "registry/config.json"
 
 	// ConfigMediaType is the reserved media type for the Helm chart manifest config
 	ConfigMediaType = "application/vnd.cncf.helm.config.v1+json"

diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
@@ -81,7 +81,7 @@ func New() *EnvSettings {
 		KubeAPIServer:    os.Getenv("HELM_KUBEAPISERVER"),
 		KubeCaFile:       os.Getenv("HELM_KUBECAFILE"),
 		PluginsDirectory: envOr("HELM_PLUGINS", helmpath.DataPath("plugins")),
-		RegistryConfig:   envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry.json")),
+		RegistryConfig:   envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry/config.json")),
 		RepositoryConfig: envOr("HELM_REPOSITORY_CONFIG", helmpath.ConfigPath("repositories.yaml")),
 		RepositoryCache:  envOr("HELM_REPOSITORY_CACHE", helmpath.CachePath("repository")),
 	}