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

Commit 83d1556

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #52855 from NickrenREN/remove-rackspace
Automatic merge from submit-queue (batch tested with PRs 52880, 52855, 52761, 52885, 52929). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Remove cloud provider rackspace **What this PR does / why we need it**: For now, we have to implement functions in both `rackspace` and `openstack` packages if we want to add function for cinder, for example [resize for cinder](kubernetes/kubernetes#51498). Since openstack has implemented all the functions rackspace has, and rackspace is considered deprecated for a long time, [rackspace deprecated](rackspace/gophercloud#592) , after talking with @mikedanese and @jamiehannaford offline , i sent this PR to remove `rackspace` in favor of `openstack` **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #52854 **Special notes for your reviewer**: **Release note**: ```release-note The Rackspace cloud provider has been removed after a long deprecation period. It was deprecated because it duplicates a lot of the OpenStack logic and can no longer be maintained. Please use the OpenStack cloud provider instead. ```
2 parents 33a9ea6 + 5649580 commit 83d1556

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@ func (os *OpenStack) HasClusterID() bool {
484484
func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
485485
glog.V(4).Info("openstack.LoadBalancer() called")
486486

487-
// TODO: Search for and support Rackspace loadbalancer API, and others.
488487
network, err := os.NewNetworkV2()
489488
if err != nil {
490489
return nil, false

pkg/volume/cinder/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ go_library(
1717
deps = [
1818
"//pkg/cloudprovider:go_default_library",
1919
"//pkg/cloudprovider/providers/openstack:go_default_library",
20-
"//pkg/cloudprovider/providers/rackspace:go_default_library",
2120
"//pkg/kubelet/apis:go_default_library",
2221
"//pkg/util/keymutex:go_default_library",
2322
"//pkg/util/mount:go_default_library",

pkg/volume/cinder/cinder.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"k8s.io/apimachinery/pkg/types"
3030
"k8s.io/kubernetes/pkg/cloudprovider"
3131
"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
32-
"k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace"
3332
"k8s.io/kubernetes/pkg/util/keymutex"
3433
"k8s.io/kubernetes/pkg/util/mount"
3534
kstrings "k8s.io/kubernetes/pkg/util/strings"
@@ -188,9 +187,6 @@ func (plugin *cinderPlugin) newProvisionerInternal(options volume.VolumeOptions,
188187
}
189188

190189
func getCloudProvider(cloudProvider cloudprovider.Interface) (CinderProvider, error) {
191-
if cloud, ok := cloudProvider.(*rackspace.Rackspace); ok && cloud != nil {
192-
return cloud, nil
193-
}
194190
if cloud, ok := cloudProvider.(*openstack.OpenStack); ok && cloud != nil {
195191
return cloud, nil
196192
}
@@ -205,12 +201,10 @@ func (plugin *cinderPlugin) getCloudProvider() (CinderProvider, error) {
205201
}
206202

207203
switch cloud := cloud.(type) {
208-
case *rackspace.Rackspace:
209-
return cloud, nil
210204
case *openstack.OpenStack:
211205
return cloud, nil
212206
default:
213-
return nil, errors.New("Invalid cloud provider: expected OpenStack or Rackspace.")
207+
return nil, errors.New("Invalid cloud provider: expected OpenStack.")
214208
}
215209
}
216210

0 commit comments

Comments
 (0)