github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

grep sed NewExperimental

Browse Source
This commit is contained in:
Chao Xu 2015-10-12 11:07:31 -07:00
parent 9a812bd0c5
commit c4ee22b5b6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@ -136,7 +136,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
// TODO: caesarxuchao: hacky way to specify version of Experimental client. // TODO: caesarxuchao: hacky way to specify version of Experimental client.
// We will fix this by supporting multiple group versions in Config // We will fix this by supporting multiple group versions in Config
cl.ExtensionsClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()}) cl.ExtensionsClient = client.NewExtensionsOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()})
storageVersions := make(map[string]string) storageVersions := make(map[string]string)
etcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("").InterfacesFor, testapi.Default.GroupAndVersion(), etcdtest.PathPrefix()) etcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("").InterfacesFor, testapi.Default.GroupAndVersion(), etcdtest.PathPrefix())
@ -986,7 +986,7 @@ func main() {
kubeClient := client.NewOrDie(&client.Config{Host: apiServerURL, Version: testapi.Default.GroupAndVersion()}) kubeClient := client.NewOrDie(&client.Config{Host: apiServerURL, Version: testapi.Default.GroupAndVersion()})
// TODO: caesarxuchao: hacky way to specify version of Experimental client. // TODO: caesarxuchao: hacky way to specify version of Experimental client.
// We will fix this by supporting multiple group versions in Config // We will fix this by supporting multiple group versions in Config
kubeClient.ExtensionsClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()}) kubeClient.ExtensionsClient = client.NewExtensionsOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()})
// Run tests in parallel // Run tests in parallel
testFuncs := []testFunc{ testFuncs := []testFunc{

2
pkg/client/unversioned/client_test.go
View File

@ -95,7 +95,7 @@ func (c *testClient) Setup(t *testing.T) *testClient {
if len(version) == 0 { if len(version) == 0 {
version = testapi.Extensions.Version() version = testapi.Extensions.Version()
} }
c.ExtensionsClient = NewExperimentalOrDie(&Config{ c.ExtensionsClient = NewExtensionsOrDie(&Config{
Host: c.server.URL, Host: c.server.URL,
Version: version, Version: version,
}) })

2
pkg/client/unversioned/helper.go
View File

@ -150,7 +150,7 @@ func New(c *Config) (*Client, error) {
return &Client{RESTClient: client, ExtensionsClient: nil}, nil return &Client{RESTClient: client, ExtensionsClient: nil}, nil
} }
experimentalConfig := *c experimentalConfig := *c
experimentalClient, err := NewExperimental(&experimentalConfig) experimentalClient, err := NewExtensions(&experimentalConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }