From e08a9270be1b3be83397c73e7635fd2ecd8f043d Mon Sep 17 00:00:00 2001 From: Allen Bai Date: Mon, 10 Jan 2022 13:42:45 -0500 Subject: [PATCH] HELM_REGISTRY_CONFIG: change default file of registry config to config.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: https://github.com/helm/helm/issues/10156 Related: https://github.com/helm/helm/issues/10122 Signed-off-by: Allen Bai --- internal/experimental/registry/constants.go | 2 +- pkg/cli/environment.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/experimental/registry/constants.go b/internal/experimental/registry/constants.go index 876e4dc13..9babcdfce 100644 --- 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 index 7e3933cc6..d5b208015 100644 --- 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")), }