github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

kubelet/rkt: update rkt version.

Browse Source
This commit is contained in:
Yifan Gu 2015-10-08 14:48:45 -07:00
parent 8fcb0dfb75
commit 0ef6af25c1
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/kubelet/rkt/rkt.go
View File

@ -51,8 +51,9 @@ import (
) )
const ( const (
acVersion = "0.6.1" acVersion = "0.7.1"
rktMinimumVersion = "0.8.1" minimumRktVersion = "0.9.0"
recommendRktVersion = "0.9.0"
systemdMinimumVersion = "219" systemdMinimumVersion = "219"
systemdServiceDir = "/run/systemd/system" systemdServiceDir = "/run/systemd/system"
@ -154,13 +155,23 @@ func New(config *Config,
if err != nil { if err != nil {
return nil, err return nil, err
} }
result, err = version.Compare(rktMinimumVersion) result, err = version.Compare(minimumRktVersion)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if result < 0 { if result < 0 {
return nil, fmt.Errorf("rkt: Version is too old, requires at least %v", rktMinimumVersion) return nil, fmt.Errorf("rkt: version is too old, requires at least %v", minimumRktVersion)
} }
result, err = version.Compare(recommendRktVersion)
if err != nil {
return nil, err
}
if result != 0 {
// TODO(yifan): Record an event to expose the information.
glog.Warningf("rkt: current version %q is not recommended (recommended version %q)", version, recommendRktVersion)
}
return rkt, nil return rkt, nil
} }
@ -580,9 +591,9 @@ func (r *Runtime) preparePod(pod *api.Pod, pullSecrets []api.Secret) (string, *k
var runPrepared string var runPrepared string
if pod.Spec.SecurityContext != nil && pod.Spec.SecurityContext.HostNetwork { if pod.Spec.SecurityContext != nil && pod.Spec.SecurityContext.HostNetwork {
runPrepared = fmt.Sprintf("%s run-prepared --mds-register=false %s", r.rktBinAbsPath, uuid) runPrepared = fmt.Sprintf("%s run-prepared --mds-register=false --net=host %s", r.rktBinAbsPath, uuid)
} else { } else {
runPrepared = fmt.Sprintf("%s run-prepared --mds-register=false --private-net %s", r.rktBinAbsPath, uuid) runPrepared = fmt.Sprintf("%s run-prepared --mds-register=false %s", r.rktBinAbsPath, uuid)
} }
// TODO handle pod.Spec.HostPID // TODO handle pod.Spec.HostPID
@ -1322,14 +1333,14 @@ func (r *Runtime) getImageByName(imageName string) (*kubecontainer.Image, error)
// ListImages lists all the available appc images on the machine by invoking 'rkt image list'. // ListImages lists all the available appc images on the machine by invoking 'rkt image list'.
func (r *Runtime) ListImages() ([]kubecontainer.Image, error) { func (r *Runtime) ListImages() ([]kubecontainer.Image, error) {
// Example output of 'rkt image list --fields=key,name': // Example output of 'rkt image list --fields=id,name --full':
// //
// KEY NAME // ID NAME
// sha512-374770396f23dd153937cd66694fe705cf375bcec7da00cf87e1d9f72c192da7 nginx:latest // sha512-374770396f23dd153937cd66694fe705cf375bcec7da00cf87e1d9f72c192da7 nginx:latest
// sha512-bead9e0df8b1b4904d0c57ade2230e6d236e8473f62614a8bc6dcf11fc924123 coreos.com/rkt/stage1:0.8.1 // sha512-bead9e0df8b1b4904d0c57ade2230e6d236e8473f62614a8bc6dcf11fc924123 coreos.com/rkt/stage1:0.8.1
// //
// With '--no-legend=true' the fist line (KEY NAME) will be omitted. // With '--no-legend=true' the fist line (KEY NAME) will be omitted.
output, err := r.runCommand("image", "list", "--no-legend=true", "--fields=key,name") output, err := r.runCommand("image", "list", "--no-legend=true", "--fields=id,name", "--full")
if err != nil { if err != nil {
return nil, err return nil, err
} }