mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Fixup in kubelet.go: Package short names should be [a-z0-9]
This commit is contained in:
parent
2a7d0df30d
commit
7b2af2dea0
@ -39,7 +39,7 @@ import (
|
||||
"k8s.io/kubernetes/cmd/kubelet/app/options"
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/apis/componentconfig"
|
||||
v1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
|
||||
componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
|
||||
"k8s.io/kubernetes/pkg/capabilities"
|
||||
"k8s.io/kubernetes/pkg/client/chaosclient"
|
||||
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
|
||||
@ -240,7 +240,7 @@ func initKubeletConfigSync(s *options.KubeletServer) (*componentconfig.KubeletCo
|
||||
startKubeletConfigSyncLoop(s, jsonstr)
|
||||
|
||||
// Convert json from API server to external type struct, and convert that to internal type struct
|
||||
extKC := v1alpha1.KubeletConfiguration{}
|
||||
extKC := componentconfigv1alpha1.KubeletConfiguration{}
|
||||
err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), []byte(jsonstr), &extKC)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -281,7 +281,7 @@ func checkPermissions() error {
|
||||
}
|
||||
|
||||
func setConfigz(cz *configz.Config, kc *componentconfig.KubeletConfiguration) {
|
||||
tmp := v1alpha1.KubeletConfiguration{}
|
||||
tmp := componentconfigv1alpha1.KubeletConfiguration{}
|
||||
api.Scheme.Convert(kc, &tmp, nil)
|
||||
cz.Set(tmp)
|
||||
}
|
||||
@ -344,7 +344,7 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.KubeletDeps) (err error) {
|
||||
var kubeClient, eventClient *clientset.Clientset
|
||||
var cloud cloudprovider.Interface
|
||||
|
||||
if s.CloudProvider != v1alpha1.AutoDetectCloudProvider {
|
||||
if s.CloudProvider != componentconfigv1alpha1.AutoDetectCloudProvider {
|
||||
cloud, err = cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile)
|
||||
if err != nil {
|
||||
return err
|
||||
|
@ -40,7 +40,7 @@ import (
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
"k8s.io/kubernetes/pkg/api/validation"
|
||||
"k8s.io/kubernetes/pkg/apis/componentconfig"
|
||||
kubeExternal "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
|
||||
componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
|
||||
"k8s.io/kubernetes/pkg/client/cache"
|
||||
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
|
||||
"k8s.io/kubernetes/pkg/client/record"
|
||||
@ -459,7 +459,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub
|
||||
cadvisor: kubeDeps.CAdvisorInterface,
|
||||
diskSpaceManager: diskSpaceManager,
|
||||
cloud: kubeDeps.Cloud,
|
||||
autoDetectCloudProvider: (kubeExternal.AutoDetectCloudProvider == kubeCfg.CloudProvider),
|
||||
autoDetectCloudProvider: (componentconfigv1alpha1.AutoDetectCloudProvider == kubeCfg.CloudProvider),
|
||||
nodeRef: nodeRef,
|
||||
nodeLabels: kubeCfg.NodeLabels,
|
||||
nodeStatusUpdateFrequency: kubeCfg.NodeStatusUpdateFrequency.Duration,
|
||||
|
Loading…
Reference in New Issue
Block a user