mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-09 21:21:14 +00:00
fix apply --force w/ invalid AND conflicting resource
This commit is contained in:
4
hack/testdata/deployment-label-change2.yaml
vendored
4
hack/testdata/deployment-label-change2.yaml
vendored
@@ -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:
|
||||
|
22
hack/testdata/deployment-label-change3.yaml
vendored
Normal file
22
hack/testdata/deployment-label-change3.yaml
vendored
Normal 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
|
Reference in New Issue
Block a user