rkt: Replace the deprecated flag 'insecure-skip-verify' with 'insecure-options'.

This commit is contained in:
Yifan Gu 2016-01-26 13:48:00 -08:00
parent 2bc12a2a8e
commit d03b705c5f
2 changed files with 9 additions and 7 deletions

View File

@ -366,9 +366,9 @@ func NewMainKubelet(
klet.pleg = pleg.NewGenericPLEG(klet.containerRuntime, plegChannelCapacity, plegRelistPeriod, nil)
case "rkt":
conf := &rkt.Config{
Path: rktPath,
Stage1Image: rktStage1Image,
InsecureSkipVerify: true,
Path: rktPath,
Stage1Image: rktStage1Image,
InsecureOptions: "image,ondisk",
}
rktRuntime, err := rkt.New(
conf,

View File

@ -19,7 +19,8 @@ package rkt
import "fmt"
// Config stores the global configuration for the rkt runtime.
// Run 'rkt' for more details.
// Detailed documents can be found at:
// https://github.com/coreos/rkt/blob/master/Documentation/commands.md#global-options
type Config struct {
// The absolute path to the binary, or leave empty to find it in $PATH.
Path string
@ -29,8 +30,9 @@ type Config struct {
Debug bool
// The rkt data directory.
Dir string
// This flag controls whether we skip image or key verification.
InsecureSkipVerify bool
// Comma-separated list of security features to disable.
// Allowed values: "none", "image", "tls", "ondisk", "http", "all".
InsecureOptions string
// The local config directory.
LocalConfigDir string
}
@ -43,7 +45,7 @@ func (c *Config) buildGlobalOptions() []string {
}
result = append(result, fmt.Sprintf("--debug=%v", c.Debug))
result = append(result, fmt.Sprintf("--insecure-skip-verify=%v", c.InsecureSkipVerify))
result = append(result, fmt.Sprintf("--insecure-options=%s", c.InsecureOptions))
if c.LocalConfigDir != "" {
result = append(result, fmt.Sprintf("--local-config=%s", c.LocalConfigDir))
}