Skip to content

K
k3s
Commit 3fa7b782 authored by Chao Xu's avatar Chao Xu
Browse files
Options

easy changes

parent 493e4486
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 115 deletions
cmd/kubeadm/app/apis/kubeadm/install/install.go
View file @ 3fa7b782
...@@ -20,9 +20,9 @@ import ( ...@@ -20,9 +20,9 @@ import (
"k8s.io/apimachinery/pkg/apimachinery/announced" "k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/pkg/api"
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
"k8s.io/kubernetes/pkg/api"
) )
func init() { func init() {
......
cmd/kubeadm/app/cmd/init.go
View file @ 3fa7b782
...@@ -28,7 +28,6 @@ import ( ...@@ -28,7 +28,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/pkg/api"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation"
...@@ -41,6 +40,7 @@ import ( ...@@ -41,6 +40,7 @@ import (
tokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/token" tokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/token"
"k8s.io/kubernetes/cmd/kubeadm/app/preflight" "k8s.io/kubernetes/cmd/kubeadm/app/preflight"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/api"
) )
var ( var (
......
cmd/kubeadm/app/cmd/join.go
View file @ 3fa7b782
...@@ -27,7 +27,6 @@ import ( ...@@ -27,7 +27,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/pkg/api"
certutil "k8s.io/client-go/util/cert" certutil "k8s.io/client-go/util/cert"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
...@@ -38,6 +37,7 @@ import ( ...@@ -38,6 +37,7 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/preflight" "k8s.io/kubernetes/cmd/kubeadm/app/preflight"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
"k8s.io/kubernetes/pkg/api"
) )
var ( var (
......
cmd/kubeadm/app/cmd/phases/certs.go
View file @ 3fa7b782
...@@ -24,12 +24,12 @@ import ( ...@@ -24,12 +24,12 @@ import (
netutil "k8s.io/apimachinery/pkg/util/net" netutil "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/client-go/pkg/api"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation"
certphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" certphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/api"
) )
func NewCmdCerts() *cobra.Command { func NewCmdCerts() *cobra.Command {
......
cmd/kubeadm/app/cmd/token.go
View file @ 3fa7b782
...@@ -31,7 +31,6 @@ import ( ...@@ -31,7 +31,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
...@@ -39,6 +38,7 @@ import ( ...@@ -39,6 +38,7 @@ import (
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
tokenutil "k8s.io/kubernetes/cmd/kubeadm/app/util/token" tokenutil "k8s.io/kubernetes/cmd/kubeadm/app/util/token"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
"k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/pkg/printers"
) )
......
cmd/kubeadm/app/phases/addons/addons.go
View file @ 3fa7b782
...@@ -25,13 +25,13 @@ import ( ...@@ -25,13 +25,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kuberuntime "k8s.io/apimachinery/pkg/runtime" kuberuntime "k8s.io/apimachinery/pkg/runtime"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/cmd/kubeadm/app/images"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/api"
) )
// CreateEssentialAddons creates the kube-proxy and kube-dns addons // CreateEssentialAddons creates the kube-proxy and kube-dns addons
......
cmd/kubeadm/app/phases/validate/validate.go
View file @ 3fa7b782
...@@ -25,13 +25,13 @@ import ( ...@@ -25,13 +25,13 @@ import (
kuberuntime "k8s.io/apimachinery/pkg/runtime" kuberuntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
nodeutil "k8s.io/client-go/pkg/api/v1/node" nodeutil "k8s.io/client-go/pkg/api/v1/node"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
"k8s.io/kubernetes/pkg/api"
) )
func Validate(kubeconfigPath string) error { func Validate(kubeconfigPath string) error {
......
pkg/api/v1/resource/BUILD
View file @ 3fa7b782
...@@ -25,9 +25,9 @@ go_library( ...@@ -25,9 +25,9 @@ go_library(
srcs = ["helpers.go"], srcs = ["helpers.go"],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
], ],
) )
......
pkg/api/v1/resource/helpers.go
View file @ 3fa7b782
...@@ -22,7 +22,6 @@ import ( ...@@ -22,7 +22,6 @@ import (
"strconv" "strconv"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
) )
...@@ -112,15 +111,19 @@ func ExtractResourceValueByContainerName(fs *v1.ResourceFieldSelector, pod *v1.P ...@@ -112,15 +111,19 @@ func ExtractResourceValueByContainerName(fs *v1.ResourceFieldSelector, pod *v1.P
return ExtractContainerResourceValue(fs, container) return ExtractContainerResourceValue(fs, container)
} }
type deepCopier interface {
DeepCopy(interface{}) (interface{}, error)
}
// ExtractResourceValueByContainerNameAndNodeAllocatable extracts the value of a resource // ExtractResourceValueByContainerNameAndNodeAllocatable extracts the value of a resource
// by providing container name and node allocatable // by providing container name and node allocatable
func ExtractResourceValueByContainerNameAndNodeAllocatable(fs *v1.ResourceFieldSelector, pod *v1.Pod, containerName string, nodeAllocatable v1.ResourceList) (string, error) { func ExtractResourceValueByContainerNameAndNodeAllocatable(copier deepCopier, fs *v1.ResourceFieldSelector, pod *v1.Pod, containerName string, nodeAllocatable v1.ResourceList) (string, error) {
realContainer, err := findContainerInPod(pod, containerName) realContainer, err := findContainerInPod(pod, containerName)
if err != nil { if err != nil {
return "", err return "", err
} }
containerCopy, err := api.Scheme.DeepCopy(realContainer) containerCopy, err := copier.DeepCopy(realContainer)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to perform a deep copy of container object: %v", err) return "", fmt.Errorf("failed to perform a deep copy of container object: %v", err)
} }
......
pkg/api/v1/types.go
View file @ 3fa7b782
...@@ -4428,3 +4428,37 @@ type NodeResources struct { ...@@ -4428,3 +4428,37 @@ type NodeResources struct {
// Capacity represents the available resources of a node // Capacity represents the available resources of a node
Capacity ResourceList `protobuf:"bytes,1,rep,name=capacity,casttype=ResourceList,castkey=ResourceName"` Capacity ResourceList `protobuf:"bytes,1,rep,name=capacity,casttype=ResourceList,castkey=ResourceName"`
} }
const (
// Enable stdin for remote command execution
ExecStdinParam = "input"
// Enable stdout for remote command execution
ExecStdoutParam = "output"
// Enable stderr for remote command execution
ExecStderrParam = "error"
// Enable TTY for remote command execution
ExecTTYParam = "tty"
// Command to run for remote command execution
ExecCommandParamm = "command"
// Name of header that specifies stream type
StreamType = "streamType"
// Value for streamType header for stdin stream
StreamTypeStdin = "stdin"
// Value for streamType header for stdout stream
StreamTypeStdout = "stdout"
// Value for streamType header for stderr stream
StreamTypeStderr = "stderr"
// Value for streamType header for data stream
StreamTypeData = "data"
// Value for streamType header for error stream
StreamTypeError = "error"
// Value for streamType header for terminal resize stream
StreamTypeResize = "resize"
// Name of header that specifies the port being forwarded
PortHeader = "port"
// Name of header that specifies a request ID used to associate the error
// and data streams for a single forwarded connection
PortForwardRequestIDHeader = "requestID"
)
pkg/apis/apps/v1beta1/conversion.go
View file @ 3fa7b782
...@@ -66,7 +66,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { ...@@ -66,7 +66,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
if err != nil { if err != nil {
return err return err
} }
err = api.Scheme.AddFieldLabelConversionFunc("apps/v1beta1", "Deployment", err = scheme.AddFieldLabelConversionFunc("apps/v1beta1", "Deployment",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "metadata.name", "metadata.namespace": case "metadata.name", "metadata.namespace":
......
pkg/client/clientset_generated/clientset/typed/core/v1/pod_expansion.go
View file @ 3fa7b782
...@@ -18,9 +18,9 @@ package v1 ...@@ -18,9 +18,9 @@ package v1
import ( import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme"
) )
// The PodExpansion interface allows manually adding extra methods to the PodInterface. // The PodExpansion interface allows manually adding extra methods to the PodInterface.
...@@ -41,5 +41,5 @@ func (c *pods) Evict(eviction *policy.Eviction) error { ...@@ -41,5 +41,5 @@ func (c *pods) Evict(eviction *policy.Eviction) error {
// Get constructs a request for getting the logs for a pod // Get constructs a request for getting the logs for a pod
func (c *pods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request { func (c *pods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request {
return c.client.Get().Namespace(c.ns).Name(name).Resource("pods").SubResource("log").VersionedParams(opts, api.ParameterCodec) return c.client.Get().Namespace(c.ns).Name(name).Resource("pods").SubResource("log").VersionedParams(opts, scheme.ParameterCodec)
} }
pkg/controller/bootstrap/bootstrapsigner.go
View file @ 3fa7b782
...@@ -30,10 +30,11 @@ import ( ...@@ -30,10 +30,11 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue" "k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
"k8s.io/kubernetes/pkg/util/metrics" "k8s.io/kubernetes/pkg/util/metrics"
) )
...@@ -291,7 +292,7 @@ func (e *BootstrapSigner) getTokens() map[string]string { ...@@ -291,7 +292,7 @@ func (e *BootstrapSigner) getTokens() map[string]string {
} }
func copyConfigMap(orig *v1.ConfigMap) (*v1.ConfigMap, error) { func copyConfigMap(orig *v1.ConfigMap) (*v1.ConfigMap, error) {
newCMObj, err := api.Scheme.DeepCopy(orig) newCMObj, err := scheme.Scheme.DeepCopy(orig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
pkg/controller/bootstrap/bootstrapsigner_test.go
View file @ 3fa7b782
...@@ -24,9 +24,9 @@ import ( ...@@ -24,9 +24,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
) )
......
pkg/controller/bootstrap/tokencleaner.go
View file @ 3fa7b782
...@@ -28,9 +28,9 @@ import ( ...@@ -28,9 +28,9 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/kubernetes/pkg/api"
bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api"
"k8s.io/kubernetes/pkg/util/metrics" "k8s.io/kubernetes/pkg/util/metrics"
) )
......
pkg/controller/bootstrap/tokencleaner_test.go
View file @ 3fa7b782
...@@ -24,8 +24,8 @@ import ( ...@@ -24,8 +24,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
) )
func init() { func init() {
......
pkg/controller/certificates/certificate_controller.go
View file @ 3fa7b782
...@@ -23,8 +23,8 @@ import ( ...@@ -23,8 +23,8 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes/scheme"
v1core "k8s.io/client-go/kubernetes/typed/core/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue" "k8s.io/client-go/util/workqueue"
...@@ -189,7 +189,7 @@ func (cc *CertificateController) maybeSignCertificate(key string) error { ...@@ -189,7 +189,7 @@ func (cc *CertificateController) maybeSignCertificate(key string) error {
} }
// need to operate on a copy so we don't mutate the csr in the shared cache // need to operate on a copy so we don't mutate the csr in the shared cache
copy, err := api.Scheme.DeepCopy(csr) copy, err := scheme.Scheme.DeepCopy(csr)
if err != nil { if err != nil {
return err return err
} }
......
pkg/controller/podautoscaler/horizontal_test.go
View file @ 3fa7b782
...@@ -29,9 +29,9 @@ import ( ...@@ -29,9 +29,9 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
clientfake "k8s.io/client-go/kubernetes/fake" clientfake "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api"
clientv1 "k8s.io/client-go/pkg/api/v1" clientv1 "k8s.io/client-go/pkg/api/v1"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
......
pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go
View file @ 3fa7b782
...@@ -26,9 +26,9 @@ import ( ...@@ -26,9 +26,9 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
kv1 "k8s.io/kubernetes/pkg/api/v1" kv1 "k8s.io/kubernetes/pkg/api/v1"
autoscalingapi "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" autoscalingapi "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake" metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake"
......
pkg/controller/podautoscaler/replica_calculator_test.go
View file @ 3fa7b782
...@@ -26,9 +26,9 @@ import ( ...@@ -26,9 +26,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
clientv1 "k8s.io/client-go/pkg/api/v1" clientv1 "k8s.io/client-go/pkg/api/v1"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
......
pkg/controller/statefulset/stateful_pod_control.go
View file @ 3fa7b782
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
errorutils "k8s.io/apimachinery/pkg/util/errors" errorutils "k8s.io/apimachinery/pkg/util/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
...@@ -127,7 +127,7 @@ func (spc *realStatefulPodControl) UpdateStatefulPod(set *apps.StatefulSet, pod ...@@ -127,7 +127,7 @@ func (spc *realStatefulPodControl) UpdateStatefulPod(set *apps.StatefulSet, pod
if updated, err := spc.podLister.Pods(set.Namespace).Get(pod.Name); err == nil { if updated, err := spc.podLister.Pods(set.Namespace).Get(pod.Name); err == nil {
// make a copy so we don't mutate the shared cache // make a copy so we don't mutate the shared cache
if copy, err := api.Scheme.DeepCopy(updated); err == nil { if copy, err := scheme.Scheme.DeepCopy(updated); err == nil {
pod = copy.(*v1.Pod) pod = copy.(*v1.Pod)
} else { } else {
utilruntime.HandleError(fmt.Errorf("error copying updated Pod: %v", err)) utilruntime.HandleError(fmt.Errorf("error copying updated Pod: %v", err))
...@@ -163,7 +163,7 @@ func (spc *realStatefulPodControl) UpdateStatefulSetStatus(set *apps.StatefulSet ...@@ -163,7 +163,7 @@ func (spc *realStatefulPodControl) UpdateStatefulSetStatus(set *apps.StatefulSet
if updated, err := spc.setLister.StatefulSets(set.Namespace).Get(set.Name); err == nil { if updated, err := spc.setLister.StatefulSets(set.Namespace).Get(set.Name); err == nil {
// make a copy so we don't mutate the shared cache // make a copy so we don't mutate the shared cache
if copy, err := api.Scheme.DeepCopy(updated); err == nil { if copy, err := scheme.Scheme.DeepCopy(updated); err == nil {
set = copy.(*apps.StatefulSet) set = copy.(*apps.StatefulSet)
} else { } else {
utilruntime.HandleError(fmt.Errorf("error copying updated StatefulSet: %v", err)) utilruntime.HandleError(fmt.Errorf("error copying updated StatefulSet: %v", err))
......
pkg/controller/statefulset/stateful_set_control.go
View file @ 3fa7b782
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"sort" "sort"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
...@@ -101,7 +101,7 @@ func (ssc *defaultStatefulSetControl) UpdateStatefulSet(set *apps.StatefulSet, p ...@@ -101,7 +101,7 @@ func (ssc *defaultStatefulSetControl) UpdateStatefulSet(set *apps.StatefulSet, p
// if the current number of replicas has changed update the statefulSets replicas // if the current number of replicas has changed update the statefulSets replicas
if set.Status.Replicas != int32(ready) || set.Status.ObservedGeneration == nil || set.Generation > *set.Status.ObservedGeneration { if set.Status.Replicas != int32(ready) || set.Status.ObservedGeneration == nil || set.Generation > *set.Status.ObservedGeneration {
obj, err := api.Scheme.Copy(set) obj, err := scheme.Scheme.Copy(set)
if err != nil { if err != nil {
return fmt.Errorf("unable to copy set: %v", err) return fmt.Errorf("unable to copy set: %v", err)
} }
...@@ -152,7 +152,7 @@ func (ssc *defaultStatefulSetControl) UpdateStatefulSet(set *apps.StatefulSet, p ...@@ -152,7 +152,7 @@ func (ssc *defaultStatefulSetControl) UpdateStatefulSet(set *apps.StatefulSet, p
continue continue
} }
// Make a deep copy so we don't mutate the shared cache // Make a deep copy so we don't mutate the shared cache
copy, err := api.Scheme.DeepCopy(replicas[i]) copy, err := scheme.Scheme.DeepCopy(replicas[i])
if err != nil { if err != nil {
return err return err
} }
......
pkg/kubelet/server/streaming/server_test.go
View file @ 3fa7b782
...@@ -31,8 +31,8 @@ import ( ...@@ -31,8 +31,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
"k8s.io/client-go/pkg/api"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward" kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward"
......
pkg/proxy/healthcheck/healthcheck.go
View file @ 3fa7b782
...@@ -27,9 +27,9 @@ import ( ...@@ -27,9 +27,9 @@ import (
"github.com/renstrom/dedent" "github.com/renstrom/dedent"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/api"
clientv1 "k8s.io/client-go/pkg/api/v1" clientv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/api"
) )
// Server serves HTTP endpoints for each service name, with results // Server serves HTTP endpoints for each service name, with results
......
pkg/volume/downwardapi/downwardapi.go
View file @ 3fa7b782
...@@ -24,6 +24,7 @@ import ( ...@@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilerrors "k8s.io/apimachinery/pkg/util/errors" utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1/resource" "k8s.io/kubernetes/pkg/api/v1/resource"
"k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/fieldpath"
...@@ -245,7 +246,7 @@ func CollectData(items []v1.DownwardAPIVolumeFile, pod *v1.Pod, host volume.Volu ...@@ -245,7 +246,7 @@ func CollectData(items []v1.DownwardAPIVolumeFile, pod *v1.Pod, host volume.Volu
nodeAllocatable, err := host.GetNodeAllocatable() nodeAllocatable, err := host.GetNodeAllocatable()
if err != nil { if err != nil {
errlist = append(errlist, err) errlist = append(errlist, err)
} else if values, err := resource.ExtractResourceValueByContainerNameAndNodeAllocatable(fileInfo.ResourceFieldRef, pod, containerName, nodeAllocatable); err != nil { } else if values, err := resource.ExtractResourceValueByContainerNameAndNodeAllocatable(api.Scheme, fileInfo.ResourceFieldRef, pod, containerName, nodeAllocatable); err != nil {
glog.Errorf("Unable to extract field %s: %s", fileInfo.ResourceFieldRef.Resource, err.Error()) glog.Errorf("Unable to extract field %s: %s", fileInfo.ResourceFieldRef.Resource, err.Error())
errlist = append(errlist, err) errlist = append(errlist, err)
} else { } else {
......
staging/src/k8s.io/apimachinery/pkg/api/meta/help.go
View file @ 3fa7b782
...@@ -175,6 +175,9 @@ func SetList(list runtime.Object, objects []runtime.Object) error { ...@@ -175,6 +175,9 @@ func SetList(list runtime.Object, objects []runtime.Object) error {
slice := reflect.MakeSlice(items.Type(), len(objects), len(objects)) slice := reflect.MakeSlice(items.Type(), len(objects), len(objects))
for i := range objects { for i := range objects {
dest := slice.Index(i) dest := slice.Index(i)
if dest.Type() == reflect.TypeOf(runtime.RawExtension{}) {
dest = dest.FieldByName("Object")
}
// check to see if you're directly assignable // check to see if you're directly assignable
if reflect.TypeOf(objects[i]).AssignableTo(dest.Type()) { if reflect.TypeOf(objects[i]).AssignableTo(dest.Type()) {
......
staging/src/k8s.io/client-go/discovery/discovery_client.go
View file @ 3fa7b782
...@@ -33,7 +33,7 @@ import ( ...@@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/version" "k8s.io/apimachinery/pkg/version"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
) )
...@@ -410,7 +410,7 @@ func withRetries(maxRetries int, f func(failEarly bool) ([]*metav1.APIResourceLi ...@@ -410,7 +410,7 @@ func withRetries(maxRetries int, f func(failEarly bool) ([]*metav1.APIResourceLi
func setDiscoveryDefaults(config *restclient.Config) error { func setDiscoveryDefaults(config *restclient.Config) error {
config.APIPath = "" config.APIPath = ""
config.GroupVersion = nil config.GroupVersion = nil
codec := runtime.NoopEncoder{Decoder: api.Codecs.UniversalDecoder()} codec := runtime.NoopEncoder{Decoder: scheme.Codecs.UniversalDecoder()}
config.NegotiatedSerializer = serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{Serializer: codec}) config.NegotiatedSerializer = serializer.NegotiatedSerializerWrapper(runtime.SerializerInfo{Serializer: codec})
if len(config.UserAgent) == 0 { if len(config.UserAgent) == 0 {
config.UserAgent = restclient.DefaultKubernetesUserAgent() config.UserAgent = restclient.DefaultKubernetesUserAgent()
......
staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go
View file @ 3fa7b782
...@@ -32,11 +32,10 @@ import ( ...@@ -32,11 +32,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
_ "k8s.io/client-go/pkg/api/install"
) )
func objBody(object interface{}) io.ReadCloser { func objBody(object interface{}) io.ReadCloser {
...@@ -60,23 +59,23 @@ func TestNegotiateVersion(t *testing.T) { ...@@ -60,23 +59,23 @@ func TestNegotiateVersion(t *testing.T) {
}{ }{
{ {
name: "server supports client default", name: "server supports client default",
serverVersions: []string{"version1", api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()}, serverVersions: []string{"version1", v1.SchemeGroupVersion.String()},
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
expectedVersion: &schema.GroupVersion{Version: "version1"}, expectedVersion: &schema.GroupVersion{Version: "version1"},
statusCode: http.StatusOK, statusCode: http.StatusOK,
}, },
{ {
name: "server falls back to client supported", name: "server falls back to client supported",
serverVersions: []string{"version1"}, serverVersions: []string{"version1"},
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
expectedVersion: &schema.GroupVersion{Version: "version1"}, expectedVersion: &schema.GroupVersion{Version: "version1"},
statusCode: http.StatusOK, statusCode: http.StatusOK,
}, },
{ {
name: "explicit version supported", name: "explicit version supported",
requiredVersion: &schema.GroupVersion{Version: "v1"}, requiredVersion: &schema.GroupVersion{Version: "v1"},
serverVersions: []string{"/version1", api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()}, serverVersions: []string{"/version1", v1.SchemeGroupVersion.String()},
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
expectedVersion: &schema.GroupVersion{Version: "v1"}, expectedVersion: &schema.GroupVersion{Version: "v1"},
statusCode: http.StatusOK, statusCode: http.StatusOK,
}, },
...@@ -84,7 +83,7 @@ func TestNegotiateVersion(t *testing.T) { ...@@ -84,7 +83,7 @@ func TestNegotiateVersion(t *testing.T) {
name: "explicit version not supported on server", name: "explicit version not supported on server",
requiredVersion: &schema.GroupVersion{Version: "v1"}, requiredVersion: &schema.GroupVersion{Version: "v1"},
serverVersions: []string{"version1"}, serverVersions: []string{"version1"},
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
expectErr: func(err error) bool { return strings.Contains(err.Error(), `server does not support API version "v1"`) }, expectErr: func(err error) bool { return strings.Contains(err.Error(), `server does not support API version "v1"`) },
statusCode: http.StatusOK, statusCode: http.StatusOK,
}, },
...@@ -99,21 +98,21 @@ func TestNegotiateVersion(t *testing.T) { ...@@ -99,21 +98,21 @@ func TestNegotiateVersion(t *testing.T) {
{ {
name: "connection refused error", name: "connection refused error",
serverVersions: []string{"version1"}, serverVersions: []string{"version1"},
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
sendErr: errors.New("connection refused"), sendErr: errors.New("connection refused"),
expectErr: func(err error) bool { return strings.Contains(err.Error(), "connection refused") }, expectErr: func(err error) bool { return strings.Contains(err.Error(), "connection refused") },
statusCode: http.StatusOK, statusCode: http.StatusOK,
}, },
{ {
name: "discovery fails due to 403 Forbidden errors and thus serverVersions is empty, use default GroupVersion", name: "discovery fails due to 403 Forbidden errors and thus serverVersions is empty, use default GroupVersion",
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
expectedVersion: &schema.GroupVersion{Version: "version1"}, expectedVersion: &schema.GroupVersion{Version: "version1"},
statusCode: http.StatusForbidden, statusCode: http.StatusForbidden,
}, },
{ {
name: "discovery fails due to 404 Not Found errors and thus serverVersions is empty, use requested GroupVersion", name: "discovery fails due to 404 Not Found errors and thus serverVersions is empty, use requested GroupVersion",
requiredVersion: &schema.GroupVersion{Version: "version1"}, requiredVersion: &schema.GroupVersion{Version: "version1"},
clientVersions: []schema.GroupVersion{{Version: "version1"}, api.Registry.GroupOrDie(api.GroupName).GroupVersion}, clientVersions: []schema.GroupVersion{{Version: "version1"}, v1.SchemeGroupVersion},
expectedVersion: &schema.GroupVersion{Version: "version1"}, expectedVersion: &schema.GroupVersion{Version: "version1"},
statusCode: http.StatusNotFound, statusCode: http.StatusNotFound,
}, },
...@@ -126,8 +125,7 @@ func TestNegotiateVersion(t *testing.T) { ...@@ -126,8 +125,7 @@ func TestNegotiateVersion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
fakeClient := &fake.RESTClient{ fakeClient := &fake.RESTClient{
APIRegistry: api.Registry, NegotiatedSerializer: scheme.Codecs,
NegotiatedSerializer: api.Codecs,
Resp: &http.Response{ Resp: &http.Response{
StatusCode: test.statusCode, StatusCode: test.statusCode,
Body: objBody(&uapi.APIVersions{Versions: test.serverVersions}), Body: objBody(&uapi.APIVersions{Versions: test.serverVersions}),
......
staging/src/k8s.io/client-go/discovery/restmapper_test.go
View file @ 3fa7b782
...@@ -25,7 +25,6 @@ import ( ...@@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/version" "k8s.io/apimachinery/pkg/version"
. "k8s.io/client-go/discovery" . "k8s.io/client-go/discovery"
"k8s.io/client-go/pkg/api"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
...@@ -209,7 +208,7 @@ func TestDeferredDiscoveryRESTMapper_CacheMiss(t *testing.T) { ...@@ -209,7 +208,7 @@ func TestDeferredDiscoveryRESTMapper_CacheMiss(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
cdc := fakeCachedDiscoveryInterface{fresh: false} cdc := fakeCachedDiscoveryInterface{fresh: false}
m := NewDeferredDiscoveryRESTMapper(&cdc, api.Registry.InterfacesFor) m := NewDeferredDiscoveryRESTMapper(&cdc, nil)
assert.False(cdc.fresh, "should NOT be fresh after instantiation") assert.False(cdc.fresh, "should NOT be fresh after instantiation")
assert.Zero(cdc.invalidateCalls, "should not have called Invalidate()") assert.Zero(cdc.invalidateCalls, "should not have called Invalidate()")
......
staging/src/k8s.io/client-go/dynamic/client.go
View file @ 3fa7b782
...@@ -34,7 +34,7 @@ import ( ...@@ -34,7 +34,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/flowcontrol"
...@@ -245,9 +245,9 @@ func (dynamicCodec) Encode(obj runtime.Object, w io.Writer) error { ...@@ -245,9 +245,9 @@ func (dynamicCodec) Encode(obj runtime.Object, w io.Writer) error {
// ContentConfig returns a restclient.ContentConfig for dynamic types. // ContentConfig returns a restclient.ContentConfig for dynamic types.
func ContentConfig() restclient.ContentConfig { func ContentConfig() restclient.ContentConfig {
var jsonInfo runtime.SerializerInfo var jsonInfo runtime.SerializerInfo
// TODO: api.Codecs here should become "pkg/apis/server/scheme" which is the minimal core you need // TODO: scheme.Codecs here should become "pkg/apis/server/scheme" which is the minimal core you need
// to talk to a kubernetes server // to talk to a kubernetes server
for _, info := range api.Codecs.SupportedMediaTypes() { for _, info := range scheme.Codecs.SupportedMediaTypes() {
if info.MediaType == runtime.ContentTypeJSON { if info.MediaType == runtime.ContentTypeJSON {
jsonInfo = info jsonInfo = info
break break
...@@ -280,10 +280,10 @@ var defaultParameterEncoder runtime.ParameterCodec = parameterCodec{} ...@@ -280,10 +280,10 @@ var defaultParameterEncoder runtime.ParameterCodec = parameterCodec{}
type versionedParameterEncoderWithV1Fallback struct{} type versionedParameterEncoderWithV1Fallback struct{}
func (versionedParameterEncoderWithV1Fallback) EncodeParameters(obj runtime.Object, to schema.GroupVersion) (url.Values, error) { func (versionedParameterEncoderWithV1Fallback) EncodeParameters(obj runtime.Object, to schema.GroupVersion) (url.Values, error) {
ret, err := api.ParameterCodec.EncodeParameters(obj, to) ret, err := scheme.ParameterCodec.EncodeParameters(obj, to)
if err != nil && runtime.IsNotRegisteredError(err) { if err != nil && runtime.IsNotRegisteredError(err) {
// fallback to v1 // fallback to v1
return api.ParameterCodec.EncodeParameters(obj, v1.SchemeGroupVersion) return scheme.ParameterCodec.EncodeParameters(obj, v1.SchemeGroupVersion)
} }
return ret, err return ret, err
} }
......
staging/src/k8s.io/client-go/dynamic/client_pool.go
View file @ 3fa7b782
...@@ -21,7 +21,6 @@ import ( ...@@ -21,7 +21,6 @@ import (
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
) )
...@@ -73,9 +72,9 @@ func NewClientPool(config *restclient.Config, mapper meta.RESTMapper, apiPathRes ...@@ -73,9 +72,9 @@ func NewClientPool(config *restclient.Config, mapper meta.RESTMapper, apiPathRes
// Instantiates a new dynamic client pool with the given config. // Instantiates a new dynamic client pool with the given config.
func NewDynamicClientPool(cfg *restclient.Config) ClientPool { func NewDynamicClientPool(cfg *restclient.Config) ClientPool {
// TODO: should use a dynamic RESTMapper built from the discovery results. // restMapper is not needed when using LegacyAPIPathResolverFunc
restMapper := api.Registry.RESTMapper() emptyMapper := meta.MultiRESTMapper{}
return NewClientPool(cfg, restMapper, LegacyAPIPathResolverFunc) return NewClientPool(cfg, emptyMapper, LegacyAPIPathResolverFunc)
} }
// ClientForGroupVersionResource uses the provided RESTMapper to identify the appropriate resource. Resource may // ClientForGroupVersionResource uses the provided RESTMapper to identify the appropriate resource. Resource may
......
staging/src/k8s.io/client-go/examples/third-party-resources/BUILD
View file @ 3fa7b782
...@@ -40,6 +40,7 @@ go_library( ...@@ -40,6 +40,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/pkg/api:go_default_library",
"//vendor/k8s.io/client-go/pkg/apis/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
......
staging/src/k8s.io/client-go/examples/third-party-resources/main.go
View file @ 3fa7b782
...@@ -27,7 +27,8 @@ import ( ...@@ -27,7 +27,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/extensions/v1beta1" "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
...@@ -90,7 +91,7 @@ func main() { ...@@ -90,7 +91,7 @@ func main() {
err = tprclient.Get(). err = tprclient.Get().
Resource("examples"). Resource("examples").
Namespace(api.NamespaceDefault). Namespace(v1.NamespaceDefault).
Name("example1"). Name("example1").
Do().Into(&example) Do().Into(&example)
...@@ -110,7 +111,7 @@ func main() { ...@@ -110,7 +111,7 @@ func main() {
var result Example var result Example
err = tprclient.Post(). err = tprclient.Post().
Resource("examples"). Resource("examples").
Namespace(api.NamespaceDefault). Namespace(v1.NamespaceDefault).
Body(example). Body(example).
Do().Into(&result) Do().Into(&result)
...@@ -150,7 +151,7 @@ func configureClient(config *rest.Config) { ...@@ -150,7 +151,7 @@ func configureClient(config *rest.Config) {
config.GroupVersion = &groupversion config.GroupVersion = &groupversion
config.APIPath = "/apis" config.APIPath = "/apis"
config.ContentType = runtime.ContentTypeJSON config.ContentType = runtime.ContentTypeJSON
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
schemeBuilder := runtime.NewSchemeBuilder( schemeBuilder := runtime.NewSchemeBuilder(
func(scheme *runtime.Scheme) error { func(scheme *runtime.Scheme) error {
...@@ -161,6 +162,6 @@ func configureClient(config *rest.Config) { ...@@ -161,6 +162,6 @@ func configureClient(config *rest.Config) {
) )
return nil return nil
}) })
metav1.AddToGroupVersion(api.Scheme, groupversion) metav1.AddToGroupVersion(scheme.Scheme, groupversion)
schemeBuilder.AddToScheme(api.Scheme) schemeBuilder.AddToScheme(scheme.Scheme)
} }
staging/src/k8s.io/client-go/examples/workqueue/main.go
View file @ 3fa7b782
...@@ -28,7 +28,6 @@ import ( ...@@ -28,7 +28,6 @@ import (
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
...@@ -163,7 +162,7 @@ func main() { ...@@ -163,7 +162,7 @@ func main() {
} }
// create the pod watcher // create the pod watcher
podListWatcher := cache.NewListWatchFromClient(clientset.Core().RESTClient(), "pods", api.NamespaceDefault, fields.Everything()) podListWatcher := cache.NewListWatchFromClient(clientset.Core().RESTClient(), "pods", v1.NamespaceDefault, fields.Everything())
// create the workqueue // create the workqueue
queue := workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()) queue := workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
......
staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod_expansion.go
View file @ 3fa7b782
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
package v1 package v1
import ( import (
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
policy "k8s.io/client-go/pkg/apis/policy/v1beta1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
...@@ -41,5 +41,5 @@ func (c *pods) Evict(eviction *policy.Eviction) error { ...@@ -41,5 +41,5 @@ func (c *pods) Evict(eviction *policy.Eviction) error {
// Get constructs a request for getting the logs for a pod // Get constructs a request for getting the logs for a pod
func (c *pods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request { func (c *pods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request {
return c.client.Get().Namespace(c.ns).Name(name).Resource("pods").SubResource("log").VersionedParams(opts, api.ParameterCodec) return c.client.Get().Namespace(c.ns).Name(name).Resource("pods").SubResource("log").VersionedParams(opts, scheme.ParameterCodec)
} }
staging/src/k8s.io/client-go/pkg/api/v1/resource/BUILD
View file @ 3fa7b782
...@@ -26,7 +26,7 @@ go_library( ...@@ -26,7 +26,7 @@ go_library(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
], ],
) )
staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers.go
View file @ 3fa7b782
...@@ -22,7 +22,6 @@ import ( ...@@ -22,7 +22,6 @@ import (
"strconv" "strconv"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
...@@ -112,15 +111,19 @@ func ExtractResourceValueByContainerName(fs *v1.ResourceFieldSelector, pod *v1.P ...@@ -112,15 +111,19 @@ func ExtractResourceValueByContainerName(fs *v1.ResourceFieldSelector, pod *v1.P
return ExtractContainerResourceValue(fs, container) return ExtractContainerResourceValue(fs, container)
} }
type deepCopier interface {
DeepCopy(interface{}) (interface{}, error)
}
// ExtractResourceValueByContainerNameAndNodeAllocatable extracts the value of a resource // ExtractResourceValueByContainerNameAndNodeAllocatable extracts the value of a resource
// by providing container name and node allocatable // by providing container name and node allocatable
func ExtractResourceValueByContainerNameAndNodeAllocatable(fs *v1.ResourceFieldSelector, pod *v1.Pod, containerName string, nodeAllocatable v1.ResourceList) (string, error) { func ExtractResourceValueByContainerNameAndNodeAllocatable(copier deepCopier, fs *v1.ResourceFieldSelector, pod *v1.Pod, containerName string, nodeAllocatable v1.ResourceList) (string, error) {
realContainer, err := findContainerInPod(pod, containerName) realContainer, err := findContainerInPod(pod, containerName)
if err != nil { if err != nil {
return "", err return "", err
} }
containerCopy, err := api.Scheme.DeepCopy(realContainer) containerCopy, err := copier.DeepCopy(realContainer)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to perform a deep copy of container object: %v", err) return "", fmt.Errorf("failed to perform a deep copy of container object: %v", err)
} }
......
staging/src/k8s.io/client-go/pkg/api/v1/types.go
View file @ 3fa7b782
...@@ -4428,3 +4428,37 @@ type NodeResources struct { ...@@ -4428,3 +4428,37 @@ type NodeResources struct {
// Capacity represents the available resources of a node // Capacity represents the available resources of a node
Capacity ResourceList `protobuf:"bytes,1,rep,name=capacity,casttype=ResourceList,castkey=ResourceName"` Capacity ResourceList `protobuf:"bytes,1,rep,name=capacity,casttype=ResourceList,castkey=ResourceName"`
} }
const (
// Enable stdin for remote command execution
ExecStdinParam = "input"
// Enable stdout for remote command execution
ExecStdoutParam = "output"
// Enable stderr for remote command execution
ExecStderrParam = "error"
// Enable TTY for remote command execution
ExecTTYParam = "tty"
// Command to run for remote command execution
ExecCommandParamm = "command"
// Name of header that specifies stream type
StreamType = "streamType"
// Value for streamType header for stdin stream
StreamTypeStdin = "stdin"
// Value for streamType header for stdout stream
StreamTypeStdout = "stdout"
// Value for streamType header for stderr stream
StreamTypeStderr = "stderr"
// Value for streamType header for data stream
StreamTypeData = "data"
// Value for streamType header for error stream
StreamTypeError = "error"
// Value for streamType header for terminal resize stream
StreamTypeResize = "resize"
// Name of header that specifies the port being forwarded
PortHeader = "port"
// Name of header that specifies a request ID used to associate the error
// and data streams for a single forwarded connection
PortForwardRequestIDHeader = "requestID"
)
staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go
View file @ 3fa7b782
...@@ -66,7 +66,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { ...@@ -66,7 +66,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
if err != nil { if err != nil {
return err return err
} }
err = api.Scheme.AddFieldLabelConversionFunc("apps/v1beta1", "Deployment", err = scheme.AddFieldLabelConversionFunc("apps/v1beta1", "Deployment",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "metadata.name", "metadata.namespace": case "metadata.name", "metadata.namespace":
......
staging/src/k8s.io/client-go/rest/config.go
View file @ 3fa7b782
...@@ -32,7 +32,7 @@ import ( ...@@ -32,7 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/version" "k8s.io/client-go/pkg/version"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
certutil "k8s.io/client-go/util/cert" certutil "k8s.io/client-go/util/cert"
...@@ -312,12 +312,12 @@ func InClusterConfig() (*Config, error) { ...@@ -312,12 +312,12 @@ func InClusterConfig() (*Config, error) {
return nil, fmt.Errorf("unable to load in-cluster configuration, KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT must be defined") return nil, fmt.Errorf("unable to load in-cluster configuration, KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT must be defined")
} }
token, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/" + api.ServiceAccountTokenKey) token, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/" + v1.ServiceAccountTokenKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }
tlsClientConfig := TLSClientConfig{} tlsClientConfig := TLSClientConfig{}
rootCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/" + api.ServiceAccountRootCAKey rootCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/" + v1.ServiceAccountRootCAKey
if _, err := certutil.NewPool(rootCAFile); err != nil { if _, err := certutil.NewPool(rootCAFile); err != nil {
glog.Errorf("Expected to load root CA config from %s, but got err: %v", rootCAFile, err) glog.Errorf("Expected to load root CA config from %s, but got err: %v", rootCAFile, err)
} else { } else {
......
staging/src/k8s.io/client-go/rest/url_utils_test.go
View file @ 3fa7b782
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"path" "path"
"testing" "testing"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1"
) )
func TestValidatesHostParameter(t *testing.T) { func TestValidatesHostParameter(t *testing.T) {
...@@ -31,17 +31,17 @@ func TestValidatesHostParameter(t *testing.T) { ...@@ -31,17 +31,17 @@ func TestValidatesHostParameter(t *testing.T) {
URL string URL string
Err bool Err bool
}{ }{
{"127.0.0.1", "", "http://127.0.0.1/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"127.0.0.1", "", "http://127.0.0.1/" + v1.SchemeGroupVersion.Version, false},
{"127.0.0.1:8080", "", "http://127.0.0.1:8080/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"127.0.0.1:8080", "", "http://127.0.0.1:8080/" + v1.SchemeGroupVersion.Version, false},
{"foo.bar.com", "", "http://foo.bar.com/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"foo.bar.com", "", "http://foo.bar.com/" + v1.SchemeGroupVersion.Version, false},
{"http://host/prefix", "", "http://host/prefix/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"http://host/prefix", "", "http://host/prefix/" + v1.SchemeGroupVersion.Version, false},
{"http://host", "", "http://host/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"http://host", "", "http://host/" + v1.SchemeGroupVersion.Version, false},
{"http://host", "/", "http://host/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"http://host", "/", "http://host/" + v1.SchemeGroupVersion.Version, false},
{"http://host", "/other", "http://host/other/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version, false}, {"http://host", "/other", "http://host/other/" + v1.SchemeGroupVersion.Version, false},
{"host/server", "", "", true}, {"host/server", "", "", true},
} }
for i, testCase := range testCases { for i, testCase := range testCases {
u, versionedAPIPath, err := DefaultServerURL(testCase.Host, testCase.APIPath, api.Registry.GroupOrDie(api.GroupName).GroupVersion, false) u, versionedAPIPath, err := DefaultServerURL(testCase.Host, testCase.APIPath, v1.SchemeGroupVersion, false)
switch { switch {
case err == nil && testCase.Err: case err == nil && testCase.Err:
t.Errorf("expected error but was nil") t.Errorf("expected error but was nil")
......
staging/src/k8s.io/client-go/tools/cache/BUILD
View file @ 3fa7b782
...@@ -33,6 +33,7 @@ go_test( ...@@ -33,6 +33,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/pkg/api:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
"//vendor/k8s.io/client-go/tools/cache/testing:go_default_library", "//vendor/k8s.io/client-go/tools/cache/testing:go_default_library",
...@@ -75,7 +76,7 @@ go_library( ...@@ -75,7 +76,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/util/clock:go_default_library", "//vendor/k8s.io/client-go/util/clock:go_default_library",
], ],
......
staging/src/k8s.io/client-go/tools/cache/index_test.go
View file @ 3fa7b782
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"testing" "testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
...@@ -119,7 +119,7 @@ func TestMultiIndexKeys(t *testing.T) { ...@@ -119,7 +119,7 @@ func TestMultiIndexKeys(t *testing.T) {
t.Errorf("Expected 0 pods but got %v", len(elmoPods)) t.Errorf("Expected 0 pods but got %v", len(elmoPods))
} }
obj, err := api.Scheme.DeepCopy(pod2) obj, err := scheme.Scheme.DeepCopy(pod2)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
......
staging/src/k8s.io/client-go/tools/cache/mutation_detector.go
View file @ 3fa7b782
...@@ -26,7 +26,7 @@ import ( ...@@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
) )
var mutationDetectionEnabled = false var mutationDetectionEnabled = false
...@@ -102,7 +102,7 @@ func (d *defaultCacheMutationDetector) AddObject(obj interface{}) { ...@@ -102,7 +102,7 @@ func (d *defaultCacheMutationDetector) AddObject(obj interface{}) {
return return
} }
copiedObj, err := api.Scheme.Copy(obj.(runtime.Object)) copiedObj, err := scheme.Scheme.Copy(obj.(runtime.Object))
if err != nil { if err != nil {
return return
} }
......
staging/src/k8s.io/client-go/tools/cache/shared_informer_test.go
View file @ 3fa7b782
...@@ -26,7 +26,7 @@ import ( ...@@ -26,7 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1"
fcache "k8s.io/client-go/tools/cache/testing" fcache "k8s.io/client-go/tools/cache/testing"
"k8s.io/client-go/util/clock" "k8s.io/client-go/util/clock"
) )
...@@ -98,11 +98,11 @@ func (l *testListener) satisfiedExpectations() bool { ...@@ -98,11 +98,11 @@ func (l *testListener) satisfiedExpectations() bool {
func TestListenerResyncPeriods(t *testing.T) { func TestListenerResyncPeriods(t *testing.T) {
// source simulates an apiserver object endpoint. // source simulates an apiserver object endpoint.
source := fcache.NewFakeControllerSource() source := fcache.NewFakeControllerSource()
source.Add(&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod1"}}) source.Add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod1"}})
source.Add(&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod2"}}) source.Add(&v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "pod2"}})
// create the shared informer and resync every 1s // create the shared informer and resync every 1s
informer := NewSharedInformer(source, &api.Pod{}, 1*time.Second).(*sharedIndexInformer) informer := NewSharedInformer(source, &v1.Pod{}, 1*time.Second).(*sharedIndexInformer)
clock := clock.NewFakeClock(time.Now()) clock := clock.NewFakeClock(time.Now())
informer.clock = clock informer.clock = clock
...@@ -187,7 +187,7 @@ func TestResyncCheckPeriod(t *testing.T) { ...@@ -187,7 +187,7 @@ func TestResyncCheckPeriod(t *testing.T) {
source := fcache.NewFakeControllerSource() source := fcache.NewFakeControllerSource()
// create the shared informer and resync every 12 hours // create the shared informer and resync every 12 hours
informer := NewSharedInformer(source, &api.Pod{}, 12*time.Hour).(*sharedIndexInformer) informer := NewSharedInformer(source, &v1.Pod{}, 12*time.Hour).(*sharedIndexInformer)
clock := clock.NewFakeClock(time.Now()) clock := clock.NewFakeClock(time.Now())
informer.clock = clock informer.clock = clock
......
staging/src/k8s.io/client-go/tools/cache/testing/BUILD
View file @ 3fa7b782
...@@ -31,6 +31,7 @@ go_library( ...@@ -31,6 +31,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/client-go/pkg/api:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
], ],
......
staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source.go
View file @ 3fa7b782
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
...@@ -153,7 +153,7 @@ func (f *FakeControllerSource) getListItemsLocked() ([]runtime.Object, error) { ...@@ -153,7 +153,7 @@ func (f *FakeControllerSource) getListItemsLocked() ([]runtime.Object, error) {
// Otherwise, if they make a change and write it back, they // Otherwise, if they make a change and write it back, they
// will inadvertently change our canonical copy (in // will inadvertently change our canonical copy (in
// addition to racing with other clients). // addition to racing with other clients).
objCopy, err := api.Scheme.DeepCopy(obj) objCopy, err := scheme.Scheme.DeepCopy(obj)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -170,7 +170,7 @@ func (f *FakeControllerSource) List(options metav1.ListOptions) (runtime.Object, ...@@ -170,7 +170,7 @@ func (f *FakeControllerSource) List(options metav1.ListOptions) (runtime.Object,
if err != nil { if err != nil {
return nil, err return nil, err
} }
listObj := &api.List{} listObj := &v1.List{}
if err := meta.SetList(listObj, list); err != nil { if err := meta.SetList(listObj, list); err != nil {
return nil, err return nil, err
} }
...@@ -242,7 +242,7 @@ func (f *FakeControllerSource) Watch(options metav1.ListOptions) (watch.Interfac ...@@ -242,7 +242,7 @@ func (f *FakeControllerSource) Watch(options metav1.ListOptions) (watch.Interfac
// it back, they will inadvertently change the our // it back, they will inadvertently change the our
// canonical copy (in addition to racing with other // canonical copy (in addition to racing with other
// clients). // clients).
objCopy, err := api.Scheme.DeepCopy(c.Object) objCopy, err := scheme.Scheme.DeepCopy(c.Object)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source_test.go
View file @ 3fa7b782
...@@ -22,7 +22,6 @@ import ( ...@@ -22,7 +22,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/api/v1"
) )
...@@ -76,7 +75,7 @@ func TestRCNumber(t *testing.T) { ...@@ -76,7 +75,7 @@ func TestRCNumber(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
if e, a := "3", list.(*api.List).ResourceVersion; e != a { if e, a := "3", list.(*v1.List).ResourceVersion; e != a {
t.Errorf("wanted %v, got %v", e, a) t.Errorf("wanted %v, got %v", e, a)
} }
......
staging/src/k8s.io/client-go/tools/clientcmd/client_config.go
View file @ 3fa7b782
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/imdario/mergo" "github.com/imdario/mergo"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
clientauth "k8s.io/client-go/tools/auth" clientauth "k8s.io/client-go/tools/auth"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
...@@ -298,7 +298,7 @@ func (config *DirectClientConfig) Namespace() (string, bool, error) { ...@@ -298,7 +298,7 @@ func (config *DirectClientConfig) Namespace() (string, bool, error) {
} }
if len(configContext.Namespace) == 0 { if len(configContext.Namespace) == 0 {
return api.NamespaceDefault, false, nil return v1.NamespaceDefault, false, nil
} }
overridden := false overridden := false
......
staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go
View file @ 3fa7b782
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
) )
...@@ -145,7 +145,7 @@ func (config *DeferredLoadingClientConfig) Namespace() (string, bool, error) { ...@@ -145,7 +145,7 @@ func (config *DeferredLoadingClientConfig) Namespace() (string, bool, error) {
if len(ns) > 0 { if len(ns) > 0 {
// if we got a non-default namespace from the kubeconfig, use it // if we got a non-default namespace from the kubeconfig, use it
if ns != api.NamespaceDefault { if ns != v1.NamespaceDefault {
return ns, false, nil return ns, false, nil
} }
......
staging/src/k8s.io/client-go/tools/portforward/portforward.go
View file @ 3fa7b782
...@@ -29,7 +29,7 @@ import ( ...@@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/v1"
) )
// TODO move to API machinery and re-unify with kubelet/server/portfoward // TODO move to API machinery and re-unify with kubelet/server/portfoward
...@@ -263,9 +263,9 @@ func (pf *PortForwarder) handleConnection(conn net.Conn, port ForwardedPort) { ...@@ -263,9 +263,9 @@ func (pf *PortForwarder) handleConnection(conn net.Conn, port ForwardedPort) {
// create error stream // create error stream
headers := http.Header{} headers := http.Header{}
headers.Set(api.StreamType, api.StreamTypeError) headers.Set(v1.StreamType, v1.StreamTypeError)
headers.Set(api.PortHeader, fmt.Sprintf("%d", port.Remote)) headers.Set(v1.PortHeader, fmt.Sprintf("%d", port.Remote))
headers.Set(api.PortForwardRequestIDHeader, strconv.Itoa(requestID)) headers.Set(v1.PortForwardRequestIDHeader, strconv.Itoa(requestID))
errorStream, err := pf.streamConn.CreateStream(headers) errorStream, err := pf.streamConn.CreateStream(headers)
if err != nil { if err != nil {
runtime.HandleError(fmt.Errorf("error creating error stream for port %d -> %d: %v", port.Local, port.Remote, err)) runtime.HandleError(fmt.Errorf("error creating error stream for port %d -> %d: %v", port.Local, port.Remote, err))
...@@ -287,7 +287,7 @@ func (pf *PortForwarder) handleConnection(conn net.Conn, port ForwardedPort) { ...@@ -287,7 +287,7 @@ func (pf *PortForwarder) handleConnection(conn net.Conn, port ForwardedPort) {
}() }()
// create data stream // create data stream
headers.Set(api.StreamType, api.StreamTypeData) headers.Set(v1.StreamType, v1.StreamTypeData)
dataStream, err := pf.streamConn.CreateStream(headers) dataStream, err := pf.streamConn.CreateStream(headers)
if err != nil { if err != nil {
runtime.HandleError(fmt.Errorf("error creating forwarding stream for port %d -> %d: %v", port.Local, port.Remote, err)) runtime.HandleError(fmt.Errorf("error creating forwarding stream for port %d -> %d: %v", port.Local, port.Remote, err))
......
staging/src/k8s.io/client-go/tools/record/BUILD
View file @ 3fa7b782
...@@ -22,7 +22,6 @@ go_test( ...@@ -22,7 +22,6 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
"//vendor/k8s.io/client-go/pkg/api:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/install:go_default_library", "//vendor/k8s.io/client-go/pkg/api/install:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
"//vendor/k8s.io/client-go/pkg/api/v1/ref:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1/ref:go_default_library",
......
test/e2e_node/gpus.go
View file @ 3fa7b782
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
......
test/e2e_node/node_container_manager_test.go
View file @ 3fa7b782
...@@ -28,7 +28,7 @@ import ( ...@@ -28,7 +28,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/componentconfig"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment