Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 1e63225

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #50858 from andrewsykim/49308
Automatic merge from submit-queue (batch tested with PRs 51148, 50816, 49741, 50858, 51223) cloudprovider.Zones should support external cloud providers **What this PR does / why we need it**: Provides methods in cloudprovider.Zones that allows external cloud providers to set the correct zone labels to nodes. Part of kubernetes/kubernetes#48690 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes kubernetes/kubernetes#49308 **Special notes for your reviewer**: Should help with getting ccm/external cloud providers to beta. **Release note**: ```release-note cloudprovider.Zones should support external cloud providers ``` cc @luxas @wlan0 @thockin
2 parents 6cdb124 + 7a780e8 commit 1e63225

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,20 @@ func (os *OpenStack) GetZone() (cloudprovider.Zone, error) {
549549
return zone, nil
550550
}
551551

552+
// GetZoneByProviderID implements Zones.GetZoneByProviderID
553+
// This is particularly useful in external cloud providers where the kubelet
554+
// does not initialize node data.
555+
func (os *OpenStack) GetZoneByProviderID(providerID string) (cloudprovider.Zone, error) {
556+
return cloudprovider.Zone{}, errors.New("GetZoneByProviderID not implemented")
557+
}
558+
559+
// GetZoneByNodeName implements Zones.GetZoneByNodeName
560+
// This is particularly useful in external cloud providers where the kubelet
561+
// does not initialize node data.
562+
func (os *OpenStack) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Zone, error) {
563+
return cloudprovider.Zone{}, errors.New("GetZoneByNodeName not imeplemented")
564+
}
565+
552566
func (os *OpenStack) Routes() (cloudprovider.Routes, bool) {
553567
glog.V(4).Info("openstack.Routes() called")
554568

0 commit comments

Comments
 (0)