github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27525 from wojtek-t/network_unavailable_only_in_gce

Browse Source 
Automatic merge from submit-queue

Don't set NetworkUnavailable condition in non-GCE/GKE clouds

Ref #27347

@davidopp @erictune @justinsb @simonswine
This commit is contained in:
k8s-merge-robot 2016-06-17 09:08:50 -07:00 committed by GitHub
commit 1444cbf594
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet.go
View File

@ -1125,7 +1125,11 @@ func (kl *Kubelet) initialNodeStatus() (*api.Node, error) {
} }
func (kl *Kubelet) providerRequiresNetworkingConfiguration() bool { func (kl *Kubelet) providerRequiresNetworkingConfiguration() bool {
if kl.cloud == nil || kl.flannelExperimentalOverlay { // TODO: We should have a mechanism to say whether native cloud provider
// is used or whether we are using overlay networking. We should return
// true for cloud providers if they implement Routes() interface and
// we are not using overlay networking.
if kl.cloud == nil || kl.cloud.ProviderName() != "gce" || kl.flannelExperimentalOverlay {
return false return false
} }
_, supported := kl.cloud.Routes() _, supported := kl.cloud.Routes()