kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix duplicated imports of k8s code (#77484) 

* fix duplicated imports of api/core/v1

* fix duplicated imports of client-go/kubernetes

* fix duplicated imports of rest code

* change import name to more reasonable

Kubernetes-commit: 5268f69405251a4a74130fa903e055a59071179a
This commit is contained in:
Daniel (Shijun) Qian 2019-05-09 01:12:48 +08:00 committed by Kubernetes Publisher
parent fd6533a7ae
commit 3a0abf14e5
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -396,11 +396,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "a0a96b929495"
"Rev": "a3da69d3723c"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "65184652c889"
"Rev": "1babf78c8b32"
},
{
"ImportPath": "k8s.io/component-base",

8
go.mod
View File

@ -59,8 +59,8 @@ require (
gopkg.in/yaml.v2 v2.2.1
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20190503110853-61630f889b3c
k8s.io/apimachinery v0.0.0-20190507223446-a0a96b929495
k8s.io/client-go v0.0.0-20190425172711-65184652c889
k8s.io/apimachinery v0.0.0-20190508063446-a3da69d3723c
k8s.io/client-go v0.0.0-20190508063711-1babf78c8b32
k8s.io/component-base v0.0.0-20190424053038-9fe063da3132
k8s.io/klog v0.3.0
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
@ -75,7 +75,7 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20190503110853-61630f889b3c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190507223446-a0a96b929495
k8s.io/client-go => k8s.io/client-go v0.0.0-20190425172711-65184652c889
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190508063446-a3da69d3723c
k8s.io/client-go => k8s.io/client-go v0.0.0-20190508063711-1babf78c8b32
k8s.io/component-base => k8s.io/component-base v0.0.0-20190424053038-9fe063da3132
)

4
go.sum
View File

@ -192,8 +192,8 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/api v0.0.0-20190503110853-61630f889b3c/go.mod h1:42M1T54fVvXj2R/yqB+v9ksH4xI41q6XU/NUlo3hyjk=
k8s.io/apimachinery v0.0.0-20190507223446-a0a96b929495/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/client-go v0.0.0-20190425172711-65184652c889/go.mod h1:PeVFCnjeDy6EwLN+wdDIZd1DwDY6jnkpQt9psMo5YRU=
k8s.io/apimachinery v0.0.0-20190508063446-a3da69d3723c/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/client-go v0.0.0-20190508063711-1babf78c8b32/go.mod h1:xF+vJeNvjoNfv1P1p3aElmg8C1YDMDUsrCtcMbYbzn0=
k8s.io/component-base v0.0.0-20190424053038-9fe063da3132/go.mod h1:pi2NQz+AaW5UMjaswai1Hfzqzhh7bV6ssi3X3k4s03g=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

3
pkg/server/genericapiserver_test.go
View File

@ -31,7 +31,6 @@ import (
"testing"
"time"
"github.com/go-openapi/spec"
openapi "github.com/go-openapi/spec"
"github.com/stretchr/testify/assert"
@ -362,7 +361,7 @@ func TestUpdateOpenAPISpec(t *testing.T) {
// verify we are able to update the served spec using the exposed service
newSpec := []byte(`{"swagger":"2.0","info":{"title":"Test Updated Generic API Server Swagger","version":"v0.1.0"},"paths":null}`)
swagger := new(spec.Swagger)
swagger := new(openapi.Swagger)
err = json.Unmarshal(newSpec, swagger)
assert.NoError(err)

3
pkg/server/options/server_run_options.go
View File

@ -18,7 +18,6 @@ package options
import (
"fmt"
"k8s.io/apiserver/pkg/features"
"net"
"time"
@ -28,7 +27,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
// add the generic feature gates
_ "k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/features"
"github.com/spf13/pflag"
)

13
pkg/server/options/serving_test.go
View File

@ -43,17 +43,16 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/version"
"k8s.io/apiserver/pkg/server"
. "k8s.io/apiserver/pkg/server"
"k8s.io/client-go/discovery"
restclient "k8s.io/client-go/rest"
cliflag "k8s.io/component-base/cli/flag"
)
func setUp(t *testing.T) Config {
func setUp(t *testing.T) server.Config {
scheme := runtime.NewScheme()
codecs := serializer.NewCodecFactory(scheme)
config := NewConfig(codecs)
config := server.NewConfig(codecs)
return *config
}
@ -211,7 +210,7 @@ func TestGetNamedCertificateMap(t *testing.T) {
NextTest:
for i, test := range tests {
var namedTLSCerts []NamedTLSCert
var namedTLSCerts []server.NamedTLSCert
bySignature := map[string]int{} // index in test.certs by cert signature
for j, c := range test.certs {
cert, err := createTestTLSCerts(c.TestCertSpec)
@ -220,7 +219,7 @@ NextTest:
continue NextTest
}
namedTLSCerts = append(namedTLSCerts, NamedTLSCert{
namedTLSCerts = append(namedTLSCerts, server.NamedTLSCert{
TLSCert: cert,
Names: c.explicitNames,
})
@ -233,7 +232,7 @@ NextTest:
bySignature[sig] = j
}
certMap, err := GetNamedCertificateMap(namedTLSCerts)
certMap, err := server.GetNamedCertificateMap(namedTLSCerts)
if err == nil && len(test.errorString) != 0 {
t.Errorf("%d - expected no error, got: %v", i, err)
} else if err != nil && err.Error() != test.errorString {
@ -496,7 +495,7 @@ func TestServerRunWithSNI(t *testing.T) {
// add poststart hook to know when the server is up.
startedCh := make(chan struct{})
s.AddPostStartHookOrDie("test-notifier", func(context PostStartHookContext) error {
s.AddPostStartHookOrDie("test-notifier", func(context server.PostStartHookContext) error {
close(startedCh)
return nil
})