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

Merge pull request #76098 from smarterclayton/move_direct_encoder

Browse Source 
Move DirectEncoder to runtime, rename, add .WithoutConversion() on CodecFactory
This commit is contained in:
Kubernetes Prow Robot
2019-04-04 21:07:55 -07:00
committed by GitHub
parent 72ed03fed4 7f9dfe58f4
commit 28295b0e78
131 changed files with 161 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/certificate/bootstrap/BUILD
View File

@@ -27,7 +27,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/certificate/bootstrap",
deps = [
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",

3
pkg/kubelet/certificate/bootstrap/bootstrap.go
View File

@@ -30,7 +30,6 @@ import (
"k8s.io/klog"
certificates "k8s.io/api/certificates/v1beta1"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
@@ -278,7 +277,7 @@ func verifyKeyData(data []byte) bool {
}
func waitForServer(cfg restclient.Config, deadline time.Duration) error {
cfg.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
cfg.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
cfg.Timeout = 1 * time.Second
cli, err := restclient.UnversionedRESTClientFor(&cfg)
if err != nil {