github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97084 from mysunshine92/serverSideApply-conflicts-link

Browse Source 
Fix the wrong link to server-side-apply conflicts
This commit is contained in:
Kubernetes Prow Robot 2020-12-09 16:50:53 -08:00 committed by GitHub
commit f58c4d8cd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kubectl/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
value; in this case, you'll become the manager if the other manager(s)
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
}