github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "fieldManager" to flag to PATCH/CREATE/UPDATE

Browse Source 
And add a corresponding flag in kubectl (for apply), even though the
value is defaulted in kubectl with "kubectl".

The flag is required for Apply patch-type, and optional for other PATCH,
CREATE and UPDATE (in which case we fallback on the user-agent).
This commit is contained in:
Antoine Pelisse
2019-02-16 20:16:11 -08:00
parent 8bde75e63f
commit eb904d8fa8
20 changed files with 378 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/diff/diff.go
View File

@@ -402,7 +402,7 @@ func (o *DiffOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
o.ServerSideApply = cmdutil.GetServerSideApplyFlag(cmd)
o.ForceConflicts = cmdutil.GetForceConflictsFlag(cmd)
if o.ForceConflicts && !o.ServerSideApply {
return fmt.Errorf("--force-conflicts only works with --server-side")
return fmt.Errorf("--experimental-force-conflicts only works with --experimental-server-side")
}
if !o.ServerSideApply {