Merge pull request #15435 from zhengguoyong/adjust_package_name_pkgcloudprovider

Auto commit by PR queue bot

pkg/cloudprovider/providers/aws/aws.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"errors"

pkg/cloudprovider/providers/aws/aws_instancegroups.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"

pkg/cloudprovider/providers/aws/aws_loadbalancer.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"

pkg/cloudprovider/providers/aws/aws_routes.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"

pkg/cloudprovider/providers/aws/aws_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"fmt"

pkg/cloudprovider/providers/aws/aws_utils.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package aws_cloud
+package aws
 
 import (
 	"github.com/aws/aws-sdk-go/aws"

pkg/cloudprovider/providers/fake/doc.go

@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package fake_cloud is a test-double implementation of cloudprovider
+// Package fake is a test-double implementation of cloudprovider
 // Interface, TCPLoadBalancer and Instances. It is useful for testing.
-package fake_cloud
+package fake

pkg/cloudprovider/providers/fake/fake.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package fake_cloud
+package fake
 
 import (
 	"errors"

pkg/cloudprovider/providers/gce/doc.go

@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package gce_cloud is an implementation of Interface, TCPLoadBalancer
+// Package gce is an implementation of Interface, TCPLoadBalancer
 // and Instances for Google Compute Engine.
-package gce_cloud
+package gce

pkg/cloudprovider/providers/gce/gce.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gce_cloud
+package gce
 
 import (
 	"fmt"

pkg/cloudprovider/providers/gce/gce_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gce_cloud
+package gce
 
 import "testing"
 

pkg/cloudprovider/providers/gce/token_source.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package gce_cloud
+package gce
 
 import (
 	"encoding/json"

pkg/cloudprovider/providers/ovirt/ovirt.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ovirt_cloud
+package ovirt
 
 import (
 	"encoding/xml"

pkg/cloudprovider/providers/ovirt/ovirt_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package ovirt_cloud
+package ovirt
 
 import (
 	"io"

pkg/cloudprovider/providers/vagrant/doc.go

@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package vagrant_cloud is an implementation of Interface, TCPLoadBalancer
+// Package vagrant is an implementation of Interface, TCPLoadBalancer
 // and Instances for developer managed Vagrant cluster.
-package vagrant_cloud
+package vagrant

pkg/cloudprovider/providers/vagrant/vagrant.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package vagrant_cloud
+package vagrant
 
 import (
 	"encoding/json"

pkg/cloudprovider/providers/vagrant/vagrant_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package vagrant_cloud
+package vagrant
 
 import (
 	"net/http"

pkg/controller/route/routecontroller_test.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/cloudprovider"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
+	fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
 )
 
 func TestIsResponsibleForRoute(t *testing.T) {

pkg/volume/aws_ebs/aws_ebs.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
+	aws_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/exec"

pkg/volume/gce_pd/gce_util.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/cloudprovider"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
+	gce_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/exec"
 	"k8s.io/kubernetes/pkg/util/operationmanager"

test/e2e/pd.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
+	aws_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util"

test/e2e/resize_nodes.go

@@ -34,7 +34,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
+	aws_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 )
 
 const (