Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1cef47fb
Commit
1cef47fb
authored
Oct 30, 2019
by
Erik Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vendor
parent
b576abf3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
image_pull.go
vendor/github.com/containerd/cri/pkg/server/image_pull.go
+12
-1
modules.txt
vendor/modules.txt
+1
-1
No files found.
vendor/github.com/containerd/cri/pkg/server/image_pull.go
View file @
1cef47fb
...
@@ -346,6 +346,17 @@ func (c *criService) registryHosts(auth *runtime.AuthConfig) docker.RegistryHost
...
@@ -346,6 +346,17 @@ func (c *criService) registryHosts(auth *runtime.AuthConfig) docker.RegistryHost
}
}
}
}
// defaultScheme returns the default scheme for a registry host.
func
defaultScheme
(
host
string
)
string
{
if
h
,
_
,
err
:=
net
.
SplitHostPort
(
host
);
err
==
nil
{
host
=
h
}
if
host
==
"localhost"
||
host
==
"127.0.0.1"
||
host
==
"::1"
{
return
"http"
}
return
"https"
}
// registryEndpoints returns endpoints for a given host.
// registryEndpoints returns endpoints for a given host.
// It adds default registry endpoint if it does not exist in the passed-in endpoint list.
// It adds default registry endpoint if it does not exist in the passed-in endpoint list.
// It also supports wildcard host matching with `*`.
// It also supports wildcard host matching with `*`.
...
@@ -371,7 +382,7 @@ func (c *criService) registryEndpoints(host string) ([]string, error) {
...
@@ -371,7 +382,7 @@ func (c *criService) registryEndpoints(host string) ([]string, error) {
return
endpoints
,
nil
return
endpoints
,
nil
}
}
}
}
return
append
(
endpoints
,
"https
://"
+
defaultHost
),
nil
return
append
(
endpoints
,
defaultScheme
(
defaultHost
)
+
"
://"
+
defaultHost
),
nil
}
}
// newTransport returns a new HTTP transport used to pull image.
// newTransport returns a new HTTP transport used to pull image.
...
...
vendor/modules.txt
View file @
1cef47fb
...
@@ -288,7 +288,7 @@ github.com/containerd/continuity/pathdriver
...
@@ -288,7 +288,7 @@ github.com/containerd/continuity/pathdriver
github.com/containerd/continuity/devices
github.com/containerd/continuity/devices
github.com/containerd/continuity/driver
github.com/containerd/continuity/driver
github.com/containerd/continuity/proto
github.com/containerd/continuity/proto
# github.com/containerd/cri v
1.11.1-0.20191009213552-1fb415d208be
# github.com/containerd/cri v
0.0.0-00010101000000-000000000000 => github.com/rancher/cri v1.3.0-k3s.2
github.com/containerd/cri
github.com/containerd/cri
github.com/containerd/cri/pkg/config
github.com/containerd/cri/pkg/config
github.com/containerd/cri/pkg/constants
github.com/containerd/cri/pkg/constants
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment