github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1506 from cpuguy83/registry_headers

Browse Source 
Add config for registry http headers
This commit is contained in:
Mike Brown 2020-06-09 18:43:11 -05:00 committed by GitHub
commit 3290b86a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/config.md
View File

@ -209,6 +209,10 @@ version = 2
# 'plugins."io.containerd.grpc.v1.cri".registry' contains config related to the registry # 'plugins."io.containerd.grpc.v1.cri".registry' contains config related to the registry
[plugins."io.containerd.grpc.v1.cri".registry] [plugins."io.containerd.grpc.v1.cri".registry]
# 'plugins."io.containerd.grpc.v1.cri.registry.headers sets the http request headers to send for all registry requests
[plugins."io.containerd.grpc.v1.cri".registry.headers]
Foo = ["bar"]
# 'plugins."io.containerd.grpc.v1.cri".registry.mirrors' are namespace to mirror mapping for all namespaces. # 'plugins."io.containerd.grpc.v1.cri".registry.mirrors' are namespace to mirror mapping for all namespaces.
[plugins."io.containerd.grpc.v1.cri".registry.mirrors] [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]

2
pkg/config/config.go
View File

@ -149,6 +149,8 @@ type Registry struct {
// be a valid url with host specified. // be a valid url with host specified.
// DEPRECATED: Use Configs instead. Remove in containerd 1.4. // DEPRECATED: Use Configs instead. Remove in containerd 1.4.
Auths map[string]AuthConfig `toml:"auths" json:"auths"` Auths map[string]AuthConfig `toml:"auths" json:"auths"`
// Headers adds additional HTTP headers that get sent to all registries
Headers map[string][]string `toml:"headers" json:"headers"`
} }
// RegistryConfig contains configuration used to communicate with the registry. // RegistryConfig contains configuration used to communicate with the registry.

3
pkg/server/image_pull.go
View File

@ -98,7 +98,8 @@ func (c *criService) PullImage(ctx context.Context, r *runtime.PullImageRequest)
} }
var ( var (
resolver = docker.NewResolver(docker.ResolverOptions{ resolver = docker.NewResolver(docker.ResolverOptions{
Hosts: c.registryHosts(r.GetAuth()), Headers: c.config.Registry.Headers,
Hosts: c.registryHosts(r.GetAuth()),
}) })
isSchema1 bool isSchema1 bool
imageHandler containerdimages.HandlerFunc = func(_ context.Context, imageHandler containerdimages.HandlerFunc = func(_ context.Context,