Merge pull request #11734 from thockin/cleanup-deprecated-rest-alias

Remove deprecated 'se' resource alias
This commit is contained in:
Marek Grabowski 2015-07-27 12:56:43 +02:00
commit 7b9e2ac63b
3 changed files with 2 additions and 3 deletions

View File

@ -116,7 +116,7 @@ kubectl create -f examples/rethinkdb/admin-service.yaml
find the service find the service
```sh ```sh
$kubectl get se $kubectl get services
NAME LABELS SELECTOR IP(S) PORT(S) NAME LABELS SELECTOR IP(S) PORT(S)
[...] [...]
rethinkdb-admin db=influxdb db=rethinkdb,role=admin 10.0.131.19 8080/TCP rethinkdb-admin db=influxdb db=rethinkdb,role=admin 10.0.131.19 8080/TCP

View File

@ -114,7 +114,6 @@ func expandResourceShortcut(resource string) string {
"pvc": "persistentvolumeclaims", "pvc": "persistentvolumeclaims",
"quota": "resourcequotas", "quota": "resourcequotas",
"rc": "replicationcontrollers", "rc": "replicationcontrollers",
"se": "services", // DEPRECATED: will be removed before 1.0
"svc": "services", "svc": "services",
} }
if expanded, ok := shortForms[resource]; ok { if expanded, ok := shortForms[resource]; ok {

View File

@ -751,7 +751,7 @@ func cleanup(filePath string, ns string, selectors ...string) {
runKubectl("stop", "-f", filePath, nsArg) runKubectl("stop", "-f", filePath, nsArg)
for _, selector := range selectors { for _, selector := range selectors {
resources := runKubectl("get", "pods,rc,se", "-l", selector, "--no-headers", nsArg) resources := runKubectl("get", "pods,rc,svc", "-l", selector, "--no-headers", nsArg)
if resources != "" { if resources != "" {
Failf("Resources left running after stop:\n%s", resources) Failf("Resources left running after stop:\n%s", resources)
} }