github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow STDIN to kubecfg via `-c -`. 

Follows the `tar xvf -` convention (because all the other conventions
are crazier?)
pull/6/head
Clayton Coleman 2014-09-20 10:54:42 -04:00
parent 06bb87c6c1
commit de9dc08e55
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/kubecfg/kubecfg.go
View File

@ -44,7 +44,7 @@ var (
serverVersion = verflag.Version("server_version", verflag.VersionFalse, "Print the server's version information and quit") serverVersion = verflag.Version("server_version", verflag.VersionFalse, "Print the server's version information and quit")
preventSkew = flag.Bool("expect_version_match", false, "Fail if server's version doesn't match own version.") preventSkew = flag.Bool("expect_version_match", false, "Fail if server's version doesn't match own version.")
httpServer = flag.String("h", "", "The host to connect to.") httpServer = flag.String("h", "", "The host to connect to.")
config = flag.String("c", "", "Path or URL to the config file.") config = flag.String("c", "", "Path or URL to the config file, or '-' to read from STDIN")
selector = flag.String("l", "", "Selector (label query) to use for listing") selector = flag.String("l", "", "Selector (label query) to use for listing")
updatePeriod = flag.Duration("u", 60*time.Second, "Update interval period") updatePeriod = flag.Duration("u", 60*time.Second, "Update interval period")
portSpec = flag.String("p", "", "The port spec, comma-separated list of <external>:<internal>,...") portSpec = flag.String("p", "", "The port spec, comma-separated list of <external>:<internal>,...")
@ -72,7 +72,7 @@ var parser = kubecfg.NewParser(map[string]runtime.Object{
}) })
func usage() { func usage() {
fmt.Fprintf(os.Stderr, `Usage: kubecfg -h [-c config/file.json] <method> fmt.Fprintf(os.Stderr, `Usage: kubecfg -h [-c config/file.json|url|-] <method>
Kubernetes REST API: Kubernetes REST API:
@ -103,6 +103,15 @@ func prettyWireStorage() string {
// readConfigData reads the bytes from the specified filesytem or network location associated with the *config flag // readConfigData reads the bytes from the specified filesytem or network location associated with the *config flag
func readConfigData() []byte { func readConfigData() []byte {
// read from STDIN
if *config == "-" {
data, err := ioutil.ReadAll(os.Stdin)
if err != nil {
glog.Fatalf("Unable to read from STDIN: %v\n", err)
}
return data
}
// we look for http:// or https:// to determine if valid URL, otherwise do normal file IO // we look for http:// or https:// to determine if valid URL, otherwise do normal file IO
if strings.Index(*config, "http://") == 0 || strings.Index(*config, "https://") == 0 { if strings.Index(*config, "http://") == 0 || strings.Index(*config, "https://") == 0 {
resp, err := http.Get(*config) resp, err := http.Get(*config)
@ -118,14 +127,14 @@ func readConfigData() []byte {
glog.Fatalf("Unable to read URL %v: %v\n", *config, err) glog.Fatalf("Unable to read URL %v: %v\n", *config, err)
} }
return data return data
} else { }
data, err := ioutil.ReadFile(*config) data, err := ioutil.ReadFile(*config)
if err != nil { if err != nil {
glog.Fatalf("Unable to read %v: %v\n", *config, err) glog.Fatalf("Unable to read %v: %v\n", *config, err)
} }
return data return data
} }
}
// readConfig reads and parses pod, replicationController, and service // readConfig reads and parses pod, replicationController, and service
// configuration files. If any errors log and exit non-zero. // configuration files. If any errors log and exit non-zero.