github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7403 from vmarmol/rkt-deps

Browse Source 
Remove DockerPrefix references in Kubelet.
This commit is contained in:
Dawn Chen
2015-04-27 19:05:43 -07:00
parent 0c611370e0 42a2059a5d
commit 4b79e5a3db
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/container/helpers.go
View File

@@ -17,6 +17,8 @@ limitations under the License.
package container
import (
"strings"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/probe"
)
@@ -37,3 +39,14 @@ type Prober interface {
type RunContainerOptionsGenerator interface {
GenerateRunContainerOptions(pod *api.Pod, container *api.Container, netMode, ipcMode string) (*RunContainerOptions, error)
}
// Trims runtime prefix from image name (e.g.: docker://busybox -> busybox).
func TrimRuntimePrefixFromImage(img string) string {
const prefixSeparator = "://"
idx := strings.Index(img, prefixSeparator)
if idx < 0 {
return img
}
return img[idx+len(prefixSeparator):]
}