mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 15:25:57 +00:00
Merge pull request #51460 from bskiba/cp
Automatic merge from submit-queue (batch tested with PRs 51441, 51356, 51460) Autodetect kubemark Cloud Provider **What this PR does / why we need it**: This is needed for CloudProviderId to be properly filled for Hollow Nodes. **Release note**: ``` NONE ```
This commit is contained in:
commit
9ccb55e012
@ -21,6 +21,7 @@ go_library(
|
||||
"//pkg/controller:go_default_library",
|
||||
"//pkg/kubelet:go_default_library",
|
||||
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
|
||||
"//pkg/kubelet/apis/kubeletconfig/v1alpha1:go_default_library",
|
||||
"//pkg/kubelet/cadvisor:go_default_library",
|
||||
"//pkg/kubelet/cm:go_default_library",
|
||||
"//pkg/kubelet/container/testing:go_default_library",
|
||||
|
@ -24,6 +24,7 @@ import (
|
||||
"k8s.io/kubernetes/cmd/kubelet/app/options"
|
||||
"k8s.io/kubernetes/pkg/kubelet"
|
||||
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
|
||||
kubeletv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1alpha1"
|
||||
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
|
||||
"k8s.io/kubernetes/pkg/kubelet/cm"
|
||||
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
|
||||
@ -110,6 +111,7 @@ func GetHollowKubeletConfig(
|
||||
f := &options.KubeletFlags{
|
||||
RootDirectory: testRootDir,
|
||||
HostnameOverride: nodeName,
|
||||
CloudProvider: kubeletv1alpha1.AutoDetectCloudProvider,
|
||||
// Use the default runtime options.
|
||||
ContainerRuntimeOptions: *options.NewContainerRuntimeOptions(),
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user