Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
39c48d36
Commit
39c48d36
authored
Sep 22, 2017
by
NickrenREN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove rackspace related code
parent
2fc479d9
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
1 addition
and
123 deletions
+1
-123
Godeps.json
Godeps/Godeps.json
+0
-105
LICENSES
Godeps/LICENSES
+0
-0
get-kube.sh
cluster/get-kube.sh
+0
-2
validation.go
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
+0
-1
.golint_failures
hack/.golint_failures
+0
-1
BUILD
pkg/cloudprovider/providers/BUILD
+0
-2
openstack.go
pkg/cloudprovider/providers/openstack/openstack.go
+0
-1
providers.go
pkg/cloudprovider/providers/providers.go
+0
-1
BUILD
pkg/volume/cinder/BUILD
+0
-1
cinder.go
pkg/volume/cinder/cinder.go
+1
-7
test_owners.csv
test/test_owners.csv
+0
-1
BUILD
vendor/BUILD
+0
-1
No files found.
Godeps/Godeps.json
View file @
39c48d36
...
...
@@ -2375,111 +2375,6 @@
"Rev"
:
"cb10db90715b14d4784465d2fa3b915dfacc0628"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/blockstorage/v1/volumes"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/bootfromvolume"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/diskconfig"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/volumeattach"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/compute/v2/flavors"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/compute/v2/images"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/identity/v2/tenants"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/identity/v2/tokens"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/identity/v3/tokens"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/openstack/utils"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/pagination"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/rackspace"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/rackspace/blockstorage/v1/volumes"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/rackspace/compute/v2/servers"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/rackspace/compute/v2/volumeattach"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/rackspace/identity/v2/tokens"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/testhelper"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rackspace/gophercloud/testhelper/client"
,
"Comment"
:
"v1.0.0-1012-ge00690e8"
,
"Rev"
:
"e00690e87603abe613e9f02c816c7c4bef82e063"
},
{
"ImportPath"
:
"github.com/rancher/go-rancher/client"
,
"Comment"
:
"v0.1.0-196-g09693a8"
,
"Rev"
:
"09693a8743ba5ee58c58c1b1e8a4abd17af00d45"
...
...
Godeps/LICENSES
View file @
39c48d36
This source diff could not be displayed because it is too large. You can
view the blob
instead.
cluster/get-kube.sh
View file @
39c48d36
...
...
@@ -36,8 +36,6 @@
# * export KUBERNETES_PROVIDER=vagrant; wget -q -O - https://get.k8s.io | bash
# VMWare Photon Controller
# * export KUBERNETES_PROVIDER=photon-controller; wget -q -O - https://get.k8s.io | bash
# Rackspace
# * export KUBERNETES_PROVIDER=rackspace; wget -q -O - https://get.k8s.io | bash
# OpenStack-Heat
# * export KUBERNETES_PROVIDER=openstack-heat; wget -q -O - https://get.k8s.io | bash
#
...
...
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View file @
39c48d36
...
...
@@ -49,7 +49,6 @@ var cloudproviders = []string{
"openstack"
,
"ovirt"
,
"photon"
,
"rackspace"
,
"vsphere"
,
}
...
...
hack/.golint_failures
View file @
39c48d36
...
...
@@ -153,7 +153,6 @@ pkg/cloudprovider/providers/gce
pkg/cloudprovider/providers/openstack
pkg/cloudprovider/providers/ovirt
pkg/cloudprovider/providers/photon
pkg/cloudprovider/providers/rackspace
pkg/cloudprovider/providers/vsphere
pkg/controller
pkg/controller/bootstrap
...
...
pkg/cloudprovider/providers/BUILD
View file @
39c48d36
...
...
@@ -16,7 +16,6 @@ go_library(
"//pkg/cloudprovider/providers/openstack:go_default_library",
"//pkg/cloudprovider/providers/ovirt:go_default_library",
"//pkg/cloudprovider/providers/photon:go_default_library",
"//pkg/cloudprovider/providers/rackspace:go_default_library",
"//pkg/cloudprovider/providers/vsphere:go_default_library",
],
)
...
...
@@ -40,7 +39,6 @@ filegroup(
"//pkg/cloudprovider/providers/openstack:all-srcs",
"//pkg/cloudprovider/providers/ovirt:all-srcs",
"//pkg/cloudprovider/providers/photon:all-srcs",
"//pkg/cloudprovider/providers/rackspace:all-srcs",
"//pkg/cloudprovider/providers/vsphere:all-srcs",
],
tags = ["automanaged"],
...
...
pkg/cloudprovider/providers/openstack/openstack.go
View file @
39c48d36
...
...
@@ -484,7 +484,6 @@ func (os *OpenStack) HasClusterID() bool {
func
(
os
*
OpenStack
)
LoadBalancer
()
(
cloudprovider
.
LoadBalancer
,
bool
)
{
glog
.
V
(
4
)
.
Info
(
"openstack.LoadBalancer() called"
)
// TODO: Search for and support Rackspace loadbalancer API, and others.
network
,
err
:=
os
.
NewNetworkV2
()
if
err
!=
nil
{
return
nil
,
false
...
...
pkg/cloudprovider/providers/providers.go
View file @
39c48d36
...
...
@@ -25,6 +25,5 @@ import (
_
"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
_
"k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt"
_
"k8s.io/kubernetes/pkg/cloudprovider/providers/photon"
_
"k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace"
_
"k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere"
)
pkg/volume/cinder/BUILD
View file @
39c48d36
...
...
@@ -17,7 +17,6 @@ go_library(
deps = [
"//pkg/cloudprovider:go_default_library",
"//pkg/cloudprovider/providers/openstack:go_default_library",
"//pkg/cloudprovider/providers/rackspace:go_default_library",
"//pkg/kubelet/apis:go_default_library",
"//pkg/util/keymutex:go_default_library",
"//pkg/util/mount:go_default_library",
...
...
pkg/volume/cinder/cinder.go
View file @
39c48d36
...
...
@@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/openstack"
"k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace"
"k8s.io/kubernetes/pkg/util/keymutex"
"k8s.io/kubernetes/pkg/util/mount"
kstrings
"k8s.io/kubernetes/pkg/util/strings"
...
...
@@ -188,9 +187,6 @@ func (plugin *cinderPlugin) newProvisionerInternal(options volume.VolumeOptions,
}
func
getCloudProvider
(
cloudProvider
cloudprovider
.
Interface
)
(
CinderProvider
,
error
)
{
if
cloud
,
ok
:=
cloudProvider
.
(
*
rackspace
.
Rackspace
);
ok
&&
cloud
!=
nil
{
return
cloud
,
nil
}
if
cloud
,
ok
:=
cloudProvider
.
(
*
openstack
.
OpenStack
);
ok
&&
cloud
!=
nil
{
return
cloud
,
nil
}
...
...
@@ -205,12 +201,10 @@ func (plugin *cinderPlugin) getCloudProvider() (CinderProvider, error) {
}
switch
cloud
:=
cloud
.
(
type
)
{
case
*
rackspace
.
Rackspace
:
return
cloud
,
nil
case
*
openstack
.
OpenStack
:
return
cloud
,
nil
default
:
return
nil
,
errors
.
New
(
"Invalid cloud provider: expected OpenStack
or Rackspace
."
)
return
nil
,
errors
.
New
(
"Invalid cloud provider: expected OpenStack."
)
}
}
...
...
test/test_owners.csv
View file @
39c48d36
...
...
@@ -658,7 +658,6 @@ k8s.io/kubernetes/pkg/cloudprovider/providers/mesos,mml,1,
k8s.io/kubernetes/pkg/cloudprovider/providers/openstack,Q-Lee,1,
k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt,dchen1107,1,
k8s.io/kubernetes/pkg/cloudprovider/providers/photon,luomiao,0,
k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace,caesarxuchao,1,
k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere,apelisse,1,
k8s.io/kubernetes/pkg/controller,mikedanese,1,
k8s.io/kubernetes/pkg/controller/bootstrap,mikedanese,0,
...
...
vendor/BUILD
View file @
39c48d36
...
...
@@ -295,7 +295,6 @@ filegroup(
"//vendor/github.com/prometheus/common/model:all-srcs",
"//vendor/github.com/prometheus/procfs:all-srcs",
"//vendor/github.com/quobyte/api:all-srcs",
"//vendor/github.com/rackspace/gophercloud:all-srcs",
"//vendor/github.com/rancher/go-rancher/client:all-srcs",
"//vendor/github.com/renstrom/dedent:all-srcs",
"//vendor/github.com/robfig/cron:all-srcs",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment