Updating integration tests to test both API versions - v1beta1 and 3

This commit is contained in:
nikhiljindal
2015-03-18 01:21:10 -07:00
parent c966ae8953
commit 7e36bbab3c
13 changed files with 175 additions and 158 deletions

View File

@@ -65,7 +65,6 @@ import (
// Config is a structure used to configure a Master.
type Config struct {
Client *client.Client
Cloud cloudprovider.Interface
EtcdHelper tools.EtcdHelper
EventTTL time.Duration
@@ -122,7 +121,6 @@ type Config struct {
// Master contains state for a Kubernetes cluster master/api server.
type Master struct {
// "Inputs", Copied from Config
client *client.Client
portalNet *net.IPNet
cacheTimeout time.Duration
@@ -262,7 +260,6 @@ func New(c *Config) *Master {
glog.V(4).Infof("Setting master service IPs based on PortalNet subnet to %q (read-only) and %q (read-write).", serviceReadOnlyIP, serviceReadWriteIP)
m := &Master{
client: c.Client,
portalNet: c.PortalNet,
rootWebService: new(restful.WebService),
enableLogsSupport: c.EnableLogsSupport,