From 59c888f8a46f53d523591975f90bf727207ac10f Mon Sep 17 00:00:00 2001 From: Beata Skiba Date: Mon, 28 Aug 2017 11:54:57 +0200 Subject: [PATCH] Autodetect kubemark Cloud Provider This is needed for CloudProviderId to be properly filled for Hollow Nodes. --- pkg/kubemark/BUILD | 1 + pkg/kubemark/hollow_kubelet.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index 080c8535014..457927addfe 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -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", diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index b81131ee62e..db52f2f0888 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -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(), }