fix apply --force w/ invalid AND conflicting resource

This commit is contained in:
juanvallejo
2018-01-29 17:28:15 -05:00
parent 235714e7f3
commit ef0e40d39c
4 changed files with 55 additions and 6 deletions

View File

@@ -2,9 +2,13 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: nginx
resourceVersion: "99"
labels:
name: nginx
spec:
selector:
matchLabels:
name: nginx2
replicas: 3
template:
metadata:

View File

@@ -0,0 +1,22 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: nginx
resourceVersion: "99"
labels:
name: nginx
spec:
selector:
matchLabels:
name: invalid
replicas: 3
template:
metadata:
labels:
name: nginx3
spec:
containers:
- name: nginx
image: gcr.io/google-containers/nginx:test-cmd
ports:
- containerPort: 80