github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111087 from HecarimV/fix-22071205

Browse Source 
Fix: import the same package multiple times
This commit is contained in:
Kubernetes Prow Robot 2022-07-12 08:32:21 -07:00 committed by GitHub
commit d46399f788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery_test.go
View File

@ -34,7 +34,6 @@ import (
"k8s.io/apimachinery/pkg/version" "k8s.io/apimachinery/pkg/version"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
"k8s.io/client-go/openapi" "k8s.io/client-go/openapi"
"k8s.io/client-go/rest"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
testutil "k8s.io/client-go/util/testing" testutil "k8s.io/client-go/util/testing"
@ -151,7 +150,7 @@ func TestOpenAPIDiskCache(t *testing.T) {
require.Greater(t, len(fakeServer.ServedDocuments), 0) require.Greater(t, len(fakeServer.ServedDocuments), 0)
client, err := NewCachedDiscoveryClientForConfig( client, err := NewCachedDiscoveryClientForConfig(
&rest.Config{Host: fakeServer.HttpServer.URL}, &restclient.Config{Host: fakeServer.HttpServer.URL},
discoCache, discoCache,
httpCache, httpCache,
1*time.Nanosecond, 1*time.Nanosecond,

5
staging/src/k8s.io/client-go/rest/exec.go
View File

@ -21,7 +21,6 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"k8s.io/client-go/pkg/apis/clientauthentication"
clientauthenticationapi "k8s.io/client-go/pkg/apis/clientauthentication" clientauthenticationapi "k8s.io/client-go/pkg/apis/clientauthentication"
) )
@ -50,7 +49,7 @@ func ConfigToExecCluster(config *Config) (*clientauthenticationapi.Cluster, erro
} }
} }
return &clientauthentication.Cluster{ return &clientauthenticationapi.Cluster{
Server: config.Host, Server: config.Host,
TLSServerName: config.ServerName, TLSServerName: config.ServerName,
InsecureSkipTLSVerify: config.Insecure, InsecureSkipTLSVerify: config.Insecure,
@ -63,7 +62,7 @@ func ConfigToExecCluster(config *Config) (*clientauthenticationapi.Cluster, erro
// ExecClusterToConfig creates a Config with the corresponding fields from the provided // ExecClusterToConfig creates a Config with the corresponding fields from the provided
// clientauthenticationapi.Cluster. The returned Config will be anonymous (i.e., it will not have // clientauthenticationapi.Cluster. The returned Config will be anonymous (i.e., it will not have
// any authentication-related fields set). // any authentication-related fields set).
func ExecClusterToConfig(cluster *clientauthentication.Cluster) (*Config, error) { func ExecClusterToConfig(cluster *clientauthenticationapi.Cluster) (*Config, error) {
var proxy func(*http.Request) (*url.URL, error) var proxy func(*http.Request) (*url.URL, error)
if cluster.ProxyURL != "" { if cluster.ProxyURL != "" {
proxyURL, err := url.Parse(cluster.ProxyURL) proxyURL, err := url.Parse(cluster.ProxyURL)

3
staging/src/k8s.io/client-go/rest/exec_test.go
View File

@ -28,7 +28,6 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
fuzz "github.com/google/gofuzz" fuzz "github.com/google/gofuzz"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/pkg/apis/clientauthentication"
clientauthenticationapi "k8s.io/client-go/pkg/apis/clientauthentication" clientauthenticationapi "k8s.io/client-go/pkg/apis/clientauthentication"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api" clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/client-go/transport" "k8s.io/client-go/transport"
@ -353,7 +352,7 @@ func TestExecClusterToConfigRoundtrip(t *testing.T) {
}, },
) )
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
expected := &clientauthentication.Cluster{} expected := &clientauthenticationapi.Cluster{}
f.Fuzz(expected) f.Fuzz(expected)
// Manually set URLs so we don't get an error when parsing these during the roundtrip. // Manually set URLs so we don't get an error when parsing these during the roundtrip.

7
staging/src/k8s.io/client-go/util/certificate/csr/csr.go
View File

@ -27,7 +27,6 @@ import (
certificatesv1 "k8s.io/api/certificates/v1" certificatesv1 "k8s.io/api/certificates/v1"
certificatesv1beta1 "k8s.io/api/certificates/v1beta1" certificatesv1beta1 "k8s.io/api/certificates/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
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"
@ -73,7 +72,7 @@ func RequestCertificate(client clientset.Interface, csrData []byte, name, signer
case err == nil: case err == nil:
return reqName, reqUID, err return reqName, reqUID, err
case errors.IsAlreadyExists(err) && len(name) > 0: case apierrors.IsAlreadyExists(err) && len(name) > 0:
klog.Infof("csr for this node already exists, reusing") klog.Infof("csr for this node already exists, reusing")
req, err := get(client, name) req, err := get(client, name)
if err != nil { if err != nil {
@ -346,8 +345,8 @@ func ensureCompatible(new, orig *certificatesv1.CertificateSigningRequest, priva
// formatError preserves the type of an API message but alters the message. Expects // formatError preserves the type of an API message but alters the message. Expects
// a single argument format string, and returns the wrapped error. // a single argument format string, and returns the wrapped error.
func formatError(format string, err error) error { func formatError(format string, err error) error {
if s, ok := err.(errors.APIStatus); ok { if s, ok := err.(apierrors.APIStatus); ok {
se := &errors.StatusError{ErrStatus: s.Status()} se := &apierrors.StatusError{ErrStatus: s.Status()}
se.ErrStatus.Message = fmt.Sprintf(format, se.ErrStatus.Message) se.ErrStatus.Message = fmt.Sprintf(format, se.ErrStatus.Message)
return se return se
} }