Merge master into release-1.10

2018-03-26 17:34:56 -07:00
parent dbbd8265a2 770440d20f
commit a82498bda5
17 changed files with 50 additions and 1457 deletions
@@ -55,7 +55,7 @@ deployment "nginx-deployment" created
 Resource creation isn't the only operation that `kubectl` can perform in bulk. It can also extract resource names from configuration files in order to perform other operations, in particular to delete the same resources you created:

 ```shell
-$ kubectl delete -f https://k8s.io/docs/concepts/cluster-administration/nginx/
+$ kubectl delete -f https://k8s.io/docs/concepts/cluster-administration/nginx-app.yaml
 deployment "my-nginx" deleted
 service "my-nginx-svc" deleted
 ```