github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28708 from euank/node-e2e-image-conf

Browse Source 
Automatic merge from submit-queue

node_e2e: configure gce images via config file

This file provides the abiliy to specify image project on a per-image
basis and is more extensible for future changes.

For backwards compatibility and local development convenience, the
existing flags are kept and should work.

The eventual goal is to be able to source some images, such as the CoreOS one (and possibly containervm one) from their upstream projects and do all new configuration changes via a cloud-init key added to the image config.

This PR is a first step there. A following PR will add a config key of `cloud-init` or `user-data` and migrate the CoreOS e2e to use that.

This motivation is driven by the fact that currently the changes needed for the CoreOS image can all be done quickly in cloud-init and this will make it much easier to update the image and ensure that changes are applied consistently.

/cc @timstclair @vishh @yifan-gu @pwittrock
This commit is contained in:
k8s-merge-robot
2016-07-12 19:06:14 -07:00
committed by GitHub
parent 0efd03810c af1700b41e
commit 0cd93cfc53
7 changed files with 98 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
test/e2e_node/runner/run_e2e.go
View File

@@ -33,6 +33,7 @@ import (
"k8s.io/kubernetes/test/e2e_node"
"github.com/ghodss/yaml"
"github.com/golang/glog"
"github.com/pborman/uuid"
"golang.org/x/oauth2"
@@ -43,6 +44,7 @@ import (
var instanceNamePrefix = flag.String("instance-name-prefix", "", "prefix for instance names")
var zone = flag.String("zone", "", "gce zone 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 imageProject = flag.String("image-project", "", "gce project the hosts live in")
var images = flag.String("images", "", "images to test")
var hosts = flag.String("hosts", "", "hosts to test")
@@ -69,6 +71,24 @@ type TestResult struct {
exitOk bool
}
// ImageConfig specifies what images should be run and how for these tests.
// It can be created via the `--images` and `--image-project` flags, or by
// specifying the `--image-config-file` flag, pointing to a json or yaml file
// of the form:
//
// images:
// short-name:
// image: gce-image-name
// project: gce-image-project
type ImageConfig struct {
Images map[string]GCEImage `json:"images"`
}
type GCEImage struct {
Image string `json:"image"`
Project string `json:"project"`
}
func main() {
flag.Parse()
rand.Seed(time.Now().UTC().UnixNano())
@@ -78,18 +98,50 @@ func main() {
return
}
if *hosts == "" && *images == "" {
glog.Fatalf("Must specify one of --images or --hosts flag.")
if *hosts == "" && *imageConfigFile == "" && *images == "" {
glog.Fatalf("Must specify one of --image-config-file, --hosts, --images.")
}
if *images != "" && *zone == "" {
glog.Fatal("Must specify --zone flag")
gceImages := &ImageConfig{
Images: make(map[string]GCEImage),
}
if *imageConfigFile != "" {
// parse images
imageConfigData, err := ioutil.ReadFile(*imageConfigFile)
if err != nil {
glog.Fatalf("Could not read image config file provided: %v", err)
}
err = yaml.Unmarshal(imageConfigData, gceImages)
if err != nil {
glog.Fatalf("Could not parse image config file: %v", err)
}
}
// Allow users to specify additional images via cli flags for local testing
// convenience; merge in with config file
if *images != "" {
if *imageProject == "" {
glog.Fatal("Must specify --image-project flag")
glog.Fatal("Must specify --image-project if you specify --images")
}
cliImages := strings.Split(*images, ",")
for _, img := range cliImages {
gceImages.Images[img] = GCEImage{
Image: img,
Project: *imageProject,
}
}
}
if len(gceImages.Images) != 0 && *zone == "" {
glog.Fatal("Must specify --zone flag")
}
for shortName, image := range gceImages.Images {
if image.Project == "" {
glog.Fatalf("Invalid config for %v; must specify a project", shortName)
}
}
if len(gceImages.Images) != 0 {
if *project == "" {
glog.Fatal("Must specify --project flag")
glog.Fatal("Must specify --project flag to launch images into")
}
}
if *instanceNamePrefix == "" {
@@ -117,12 +169,12 @@ func main() {
results := make(chan *TestResult)
running := 0
if *images != "" {
for _, image := range strings.Split(*images, ",") {
running++
fmt.Printf("Initializing e2e tests using image %s.\n", image)
go func(image string, junitFileNum int) { results <- testImage(image, junitFileNum) }(image, running)
}
for shortName, image := range gceImages.Images {
running++
fmt.Printf("Initializing e2e tests using image %s.\n", shortName)
go func(image, imageProject string, junitFileNum int) {
results <- testImage(image, imageProject, junitFileNum)
}(image.Image, image.Project, running)
}
if *hosts != "" {
for _, host := range strings.Split(*hosts, ",") {
@@ -213,8 +265,8 @@ func testHost(host string, deleteFiles bool, junitFileNum int, setupNode bool) *
// Provision a gce instance using image and run the tests in archive against the instance.
// Delete the instance afterward.
func testImage(image string, junitFileNum int) *TestResult {
host, err := createInstance(image)
func testImage(image, imageProject string, junitFileNum int) *TestResult {
host, err := createInstance(image, imageProject)
if *deleteInstances {
defer deleteInstance(image)
}
@@ -231,7 +283,7 @@ func testImage(image string, junitFileNum int) *TestResult {
}
// Provision a gce instance using image
func createInstance(image string) (string, error) {
func createInstance(image, imageProject string) (string, error) {
name := imageToInstanceName(image)
i := &compute.Instance{
Name: name,
@@ -251,7 +303,7 @@ func createInstance(image string) (string, error) {
Boot: true,
Type: "PERSISTENT",
InitializeParams: &compute.AttachedDiskInitializeParams{
SourceImage: sourceImage(image),
SourceImage: sourceImage(image, imageProject),
},
},
},
@@ -386,8 +438,8 @@ func imageToInstanceName(image string) string {
return *instanceNamePrefix + "-" + image
}
func sourceImage(image string) string {
return fmt.Sprintf("projects/%s/global/images/%s", *imageProject, image)
func sourceImage(image, imageProject string) string {
return fmt.Sprintf("projects/%s/global/images/%s", imageProject, image)
}
func machineType() string {