github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96413 from pigletfly/fix-kubelet-import

Browse Source 
Remove duplicate import
This commit is contained in:
Kubernetes Prow Robot 2020-11-10 11:48:13 -08:00 committed by GitHub
commit d41f791542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubelet/app/server.go
View File

@ -59,7 +59,6 @@ import (
"k8s.io/client-go/util/connrotation" "k8s.io/client-go/util/connrotation"
"k8s.io/client-go/util/keyutil" "k8s.io/client-go/util/keyutil"
cloudprovider "k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
"k8s.io/component-base/cli/flag"
cliflag "k8s.io/component-base/cli/flag" cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/configz" "k8s.io/component-base/configz"
"k8s.io/component-base/featuregate" "k8s.io/component-base/featuregate"
@ -1015,7 +1014,7 @@ func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletCo
} }
if len(tlsCipherSuites) > 0 { if len(tlsCipherSuites) > 0 {
insecureCiphers := flag.InsecureTLSCiphers() insecureCiphers := cliflag.InsecureTLSCiphers()
for i := 0; i < len(tlsCipherSuites); i++ { for i := 0; i < len(tlsCipherSuites); i++ {
for cipherName, cipherID := range insecureCiphers { for cipherName, cipherID := range insecureCiphers {
if tlsCipherSuites[i] == cipherID { if tlsCipherSuites[i] == cipherID {