Skip to content

Commit 59c888f

Browse files
committed
Autodetect kubemark Cloud Provider
This is needed for CloudProviderId to be properly filled for Hollow Nodes.
1 parent 59a63be commit 59c888f

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

‎pkg/kubemark/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ go_library(
2121
"//pkg/controller:go_default_library",
2222
"//pkg/kubelet:go_default_library",
2323
"//pkg/kubelet/apis/kubeletconfig:go_default_library",
24+
"//pkg/kubelet/apis/kubeletconfig/v1alpha1:go_default_library",
2425
"//pkg/kubelet/cadvisor:go_default_library",
2526
"//pkg/kubelet/cm:go_default_library",
2627
"//pkg/kubelet/container/testing:go_default_library",

‎pkg/kubemark/hollow_kubelet.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"k8s.io/kubernetes/cmd/kubelet/app/options"
2525
"k8s.io/kubernetes/pkg/kubelet"
2626
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
27+
kubeletv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1alpha1"
2728
"k8s.io/kubernetes/pkg/kubelet/cadvisor"
2829
"k8s.io/kubernetes/pkg/kubelet/cm"
2930
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
@@ -110,6 +111,7 @@ func GetHollowKubeletConfig(
110111
f := &options.KubeletFlags{
111112
RootDirectory: testRootDir,
112113
HostnameOverride: nodeName,
114+
CloudProvider: kubeletv1alpha1.AutoDetectCloudProvider,
113115
// Use the default runtime options.
114116
ContainerRuntimeOptions: *options.NewContainerRuntimeOptions(),
115117
}

0 commit comments

Comments
 (0)