Merge pull request #1506 from cpuguy83/registry_headers

mikebrow · web-flow · commit 3290b86a8ce0 · 2020-06-09T18:43:11.000-05:00
Add config for registry http headers
diff --git a/docs/config.md b/docs/config.md
@@ -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]
 
+    # '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]
       [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -149,6 +149,8 @@ type Registry struct {
 	// be a valid url with host specified.
 	// DEPRECATED: Use Configs instead. Remove in containerd 1.4.
 	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.
diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go
@@ -98,7 +98,8 @@ func (c *criService) PullImage(ctx context.Context, r *runtime.PullImageRequest)
 	}
 	var (
 		resolver = docker.NewResolver(docker.ResolverOptions{
-			Hosts: c.registryHosts(r.GetAuth()),
+			Headers: c.config.Registry.Headers,
+			Hosts:   c.registryHosts(r.GetAuth()),
 		})
 		isSchema1    bool
 		imageHandler containerdimages.HandlerFunc = func(_ context.Context,

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