github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Add a flag to customize config relative dir

Browse Source
This commit is contained in:
Sen Lu 2017-10-03 16:47:14 -07:00
parent 41568a0602
commit 86936539b2
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e_node/runner/remote/run_remote.go
View File

@ -28,6 +28,7 @@ import (
"net/http" "net/http"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"regexp" "regexp"
"sort" "sort"
"strings" "strings"
@ -50,6 +51,7 @@ var instanceNamePrefix = flag.String("instance-name-prefix", "", "prefix for ins
var zone = flag.String("zone", "", "gce zone the hosts live in") var zone = flag.String("zone", "", "gce zone the hosts live in")
var project = flag.String("project", "", "gce project the hosts live in") var project = flag.String("project", "", "gce project the hosts live in")
var imageConfigFile = flag.String("image-config-file", "", "yaml file describing images to run") var imageConfigFile = flag.String("image-config-file", "", "yaml file describing images to run")
var imageConfigDir = flag.String("image-config-dir", "", "(optional)path to image config files")
var imageProject = flag.String("image-project", "", "gce project the hosts live in") var imageProject = flag.String("image-project", "", "gce project the hosts live in")
var images = flag.String("images", "", "images to test") var images = flag.String("images", "", "images to test")
var hosts = flag.String("hosts", "", "hosts to test") var hosts = flag.String("hosts", "", "hosts to test")
@ -177,8 +179,13 @@ func main() {
images: make(map[string]internalGCEImage), images: make(map[string]internalGCEImage),
} }
if *imageConfigFile != "" { if *imageConfigFile != "" {
configPath := *imageConfigFile
if *imageConfigDir != "" {
configPath = filepath.Join(*imageConfigDir, *imageConfigFile)
}
// parse images // parse images
imageConfigData, err := ioutil.ReadFile(*imageConfigFile) imageConfigData, err := ioutil.ReadFile(configPath)
if err != nil { if err != nil {
glog.Fatalf("Could not read image config file provided: %v", err) glog.Fatalf("Could not read image config file provided: %v", err)
} }
@ -694,9 +701,13 @@ func parseInstanceMetadata(str string) map[string]string {
glog.Fatalf("Invalid instance metadata: %q", s) glog.Fatalf("Invalid instance metadata: %q", s)
continue continue
} }
v, err := ioutil.ReadFile(kp[1]) metaPath := kp[1]
if *imageConfigDir != "" {
metaPath = filepath.Join(*imageConfigDir, metaPath)
}
v, err := ioutil.ReadFile(metaPath)
if err != nil { if err != nil {
glog.Fatalf("Failed to read metadata file %q: %v", kp[1], err) glog.Fatalf("Failed to read metadata file %q: %v", metaPath, err)
continue continue
} }
metadata[kp[0]] = string(v) metadata[kp[0]] = string(v)