github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 00:57:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51460 from bskiba/cp

Browse Source 
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:
Kubernetes Submit Queue 2017-08-28 06:41:27 -07:00 committed by GitHub
commit 9ccb55e012
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubemark/BUILD
View File

@ -21,6 +21,7 @@ go_library(
"//pkg/controller:go_default_library", "//pkg/controller:go_default_library",
"//pkg/kubelet:go_default_library", "//pkg/kubelet:go_default_library",
"//pkg/kubelet/apis/kubeletconfig: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/cadvisor:go_default_library",
"//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm:go_default_library",
"//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/container/testing:go_default_library",

2
pkg/kubemark/hollow_kubelet.go
View File

@ -24,6 +24,7 @@ import (
"k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet"
"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" "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/cadvisor"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"
@ -110,6 +111,7 @@ func GetHollowKubeletConfig(
f := &options.KubeletFlags{ f := &options.KubeletFlags{
RootDirectory: testRootDir, RootDirectory: testRootDir,
HostnameOverride: nodeName, HostnameOverride: nodeName,
CloudProvider: kubeletv1alpha1.AutoDetectCloudProvider,
// Use the default runtime options. // Use the default runtime options.
ContainerRuntimeOptions: *options.NewContainerRuntimeOptions(), ContainerRuntimeOptions: *options.NewContainerRuntimeOptions(),
} }