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

Get the unversioned client to build

Browse Source
This commit is contained in:
Kris Rousey 2015-08-12 11:18:22 -07:00 committed by Kris
parent 7ba5b058cc
commit 9cea046f42
24 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/client/unversioned/auth/clientauth.go
View File

@ -68,7 +68,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
) )
// Info holds Kubernetes API authorization config. It is intended // Info holds Kubernetes API authorization config. It is intended

2
pkg/client/unversioned/auth/clientauth_test.go
View File

@ -22,7 +22,7 @@ import (
"reflect" "reflect"
"testing" "testing"
clientauth "k8s.io/kubernetes/pkg/client/auth" clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth"
) )
func TestLoadFromFile(t *testing.T) { func TestLoadFromFile(t *testing.T) {

2
pkg/client/unversioned/cache/listwatch.go vendored
View File

@ -17,7 +17,7 @@ limitations under the License.
package cache package cache
import ( import (
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"

2
pkg/client/unversioned/cache/listwatch_test.go vendored
View File

@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
) )

2
pkg/client/unversioned/clientcmd/api/latest/latest.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package latest package latest
import ( import (
"k8s.io/kubernetes/pkg/client/clientcmd/api/v1" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
) )

2
pkg/client/unversioned/clientcmd/api/v1/conversion.go
View File

@ -19,7 +19,7 @@ package v1
import ( import (
"sort" "sort"
"k8s.io/kubernetes/pkg/client/clientcmd/api" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
"k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
) )

2
pkg/client/unversioned/clientcmd/api/v1/register.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/kubernetes/pkg/client/clientcmd/api" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
) )

4
pkg/client/unversioned/clientcmd/client_config_test.go
View File

@ -21,8 +21,8 @@ import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
) )
func createValidTestConfig() *clientcmdapi.Config { func createValidTestConfig() *clientcmdapi.Config {

4
pkg/client/unversioned/clientcmd/loader.go
View File

@ -28,8 +28,8 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/imdario/mergo" "github.com/imdario/mergo"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" clientcmdlatest "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest"
"k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/errors"
) )

4
pkg/client/unversioned/clientcmd/loader_test.go
View File

@ -28,8 +28,8 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" clientcmdlatest "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest"
) )
var ( var (

4
pkg/client/unversioned/clientcmd/merged_client_builder.go
View File

@ -22,8 +22,8 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
) )
// DeferredLoadingClientConfig is a ClientConfig interface that is backed by a set of loading rules // DeferredLoadingClientConfig is a ClientConfig interface that is backed by a set of loading rules

2
pkg/client/unversioned/clientcmd/overrides.go
View File

@ -21,7 +21,7 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
) )
// ConfigOverrides holds values that should override whatever information is pulled from the actual Config object. You can't // ConfigOverrides holds values that should override whatever information is pulled from the actual Config object. You can't

2
pkg/client/unversioned/clientcmd/validation.go
View File

@ -22,7 +22,7 @@ import (
"os" "os"
"strings" "strings"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
utilerrors "k8s.io/kubernetes/pkg/util/errors" utilerrors "k8s.io/kubernetes/pkg/util/errors"
) )

2
pkg/client/unversioned/clientcmd/validation_test.go
View File

@ -22,7 +22,7 @@ import (
"strings" "strings"
"testing" "testing"
clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
"k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/util/errors"
) )

12
pkg/client/unversioned/kubelet_test.go
View File

@ -129,9 +129,9 @@ func TestNewKubeletClientTLSInvalid(t *testing.T) {
EnableHttps: true, EnableHttps: true,
//Invalid certificate and key path //Invalid certificate and key path
TLSClientConfig: TLSClientConfig{ TLSClientConfig: TLSClientConfig{
CertFile: "./testdata/mycertinvalid.cer", CertFile: "../testdata/mycertinvalid.cer",
KeyFile: "./testdata/mycertinvalid.key", KeyFile: "../testdata/mycertinvalid.key",
CAFile: "./testdata/myCA.cer", CAFile: "../testdata/myCA.cer",
}, },
} }
@ -149,11 +149,11 @@ func TestNewKubeletClientTLSValid(t *testing.T) {
Port: 9000, Port: 9000,
EnableHttps: true, EnableHttps: true,
TLSClientConfig: TLSClientConfig{ TLSClientConfig: TLSClientConfig{
CertFile: "./testdata/mycertvalid.cer", CertFile: "../testdata/mycertvalid.cer",
// TLS Configuration, only applies if EnableHttps is true. // TLS Configuration, only applies if EnableHttps is true.
KeyFile: "./testdata/mycertvalid.key", KeyFile: "../testdata/mycertvalid.key",
// TLS Configuration, only applies if EnableHttps is true. // TLS Configuration, only applies if EnableHttps is true.
CAFile: "./testdata/myCA.cer", CAFile: "../testdata/myCA.cer",
}, },
} }

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

@ -28,7 +28,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/httpstream/spdy"
) )

2
pkg/client/unversioned/portforward/portforward_test.go
View File

@ -30,7 +30,7 @@ import (
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream"
) )

2
pkg/client/unversioned/record/event.go
View File

@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"

2
pkg/client/unversioned/record/event_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
) )

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

@ -24,7 +24,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/conversion/queryparams" "k8s.io/kubernetes/pkg/conversion/queryparams"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream"

2
pkg/client/unversioned/remotecommand/remotecommand_test.go
View File

@ -27,7 +27,7 @@ import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream"
"k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/httpstream/spdy"
) )

2
pkg/client/unversioned/testclient/fake_test.go
View File

@ -19,7 +19,7 @@ package testclient
import ( import (
"testing" "testing"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
) )
// This test file just ensures that Fake and structs it is embedded in // This test file just ensures that Fake and structs it is embedded in

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

@ -22,7 +22,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/registered" "k8s.io/kubernetes/pkg/api/registered"
"k8s.io/kubernetes/pkg/client" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"

2
pkg/client/unversioned/testclient/testclient_test.go
View File

@ -28,7 +28,7 @@ import (
func TestNewClient(t *testing.T) { func TestNewClient(t *testing.T) {
o := NewObjects(api.Scheme, api.Scheme) o := NewObjects(api.Scheme, api.Scheme)
if err := AddObjectsFromPath("../../../examples/guestbook/frontend-service.yaml", o, api.Scheme); err != nil { if err := AddObjectsFromPath("../../../../examples/guestbook/frontend-service.yaml", o, api.Scheme); err != nil {
t.Fatal(err) t.Fatal(err)
} }
client := &Fake{ReactFn: ObjectReaction(o, latest.RESTMapper)} client := &Fake{ReactFn: ObjectReaction(o, latest.RESTMapper)}