kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the wrong link to server-side-apply conflicts 

Kubernetes-commit: 958411f452377fda0e3e69a212fe339e73ff499b
This commit is contained in:
wangyamei 2020-12-05 22:59:43 +08:00 committed by Kubernetes Publisher
parent 3d80b9f024
commit d67b96c166
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmd/apply/apply.go
View File

@ -464,7 +464,7 @@ are the ways you can resolve this warning:
* You may co-own fields by updating your manifest to match the existing * You may co-own fields by updating your manifest to match the existing
value; in this case, you'll become the manager if the other manager(s) value; in this case, you'll become the manager if the other manager(s)
stop managing the field (remove it from their configuration). stop managing the field (remove it from their configuration).
See http://k8s.io/docs/reference/using-api/api-concepts/#conflicts`, err) See http://k8s.io/docs/reference/using-api/server-side-apply/#conflicts`, err)
} }
return err return err
} }