Revert "Repair and sync the dev-1.18 branch" (#19228)

This commit is contained in:
Zach Corleissen
2020-02-21 12:16:47 -08:00
committed by GitHub
parent 6ea6519b8f
commit e66e21ab7b
117 changed files with 3577 additions and 2899 deletions
@@ -983,11 +983,11 @@ TODO(pwittrock): Why doesn't export remove the status field? Seems like it shou
```yaml
selector:
matchLabels:
controller-selector: "apps/v1/deployment/nginx"
controller-selector: "extensions/v1beta1/deployment/nginx"
template:
metadata:
labels:
controller-selector: "apps/v1/deployment/nginx"
controller-selector: "extensions/v1beta1/deployment/nginx"
```
{{% capture whatsnext %}}
@@ -135,11 +135,11 @@ kubectl create -f <url> --edit
```yaml
selector:
matchLabels:
controller-selector: "apps/v1/deployment/nginx"
controller-selector: "extensions/v1beta1/deployment/nginx"
template:
metadata:
labels:
controller-selector: "apps/v1/deployment/nginx"
controller-selector: "extensions/v1beta1/deployment/nginx"
```
{{% /capture %}}