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

Merge pull request #23723 from intelsdi-x/stage1_image_rkt_deprecated_flag

Browse Source 
keep deprecated flag stage1-image with rkt
This commit is contained in:
Jeff Lowdermilk 2016-04-08 20:53:09 -07:00
commit 2dd9bf535f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -807,7 +807,7 @@ func (r *Runtime) preparePod(pod *api.Pod, pullSecrets []api.Secret) (string, *k
// Run 'rkt prepare' to get the rkt UUID. // Run 'rkt prepare' to get the rkt UUID.
cmds := []string{"prepare", "--quiet", "--pod-manifest", manifestFile.Name()} cmds := []string{"prepare", "--quiet", "--pod-manifest", manifestFile.Name()}
if r.config.Stage1Image != "" { if r.config.Stage1Image != "" {
cmds = append(cmds, "--stage1-image", r.config.Stage1Image) cmds = append(cmds, "--stage1-path", r.config.Stage1Image)
} }
output, err := r.runCommand(cmds...) output, err := r.runCommand(cmds...)
if err != nil { if err != nil {