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

Merge pull request #93548 from smarterclayton/patch_file

Browse Source 
kubectl: Allow --patch-file to be passed to `kubectl patch`
This commit is contained in:
Kubernetes Prow Robot 2020-09-01 18:43:06 -07:00 committed by GitHub
commit 67e7d5897e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
staging/src/k8s.io/kubectl/pkg/cmd/patch/patch.go
View File

@ -18,6 +18,7 @@ package patch
import ( import (
"fmt" "fmt"
"io/ioutil"
"reflect" "reflect"
"strings" "strings"
@ -57,6 +58,7 @@ type PatchOptions struct {
Local bool Local bool
PatchType string PatchType string
Patch string Patch string
PatchFile string
namespace string namespace string
enforceNamespace bool enforceNamespace bool
@ -107,9 +109,9 @@ func NewCmdPatch(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr
o := NewPatchOptions(ioStreams) o := NewPatchOptions(ioStreams)
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "patch (-f FILENAME | TYPE NAME) -p PATCH", Use: "patch (-f FILENAME | TYPE NAME) [-p PATCH|--patch-file FILE]",
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
Short: i18n.T("Update field(s) of a resource using strategic merge patch"), Short: i18n.T("Update field(s) of a resource"),
Long: patchLong, Long: patchLong,
Example: patchExample, Example: patchExample,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
@ -123,7 +125,7 @@ func NewCmdPatch(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobr
o.PrintFlags.AddFlags(cmd) o.PrintFlags.AddFlags(cmd)
cmd.Flags().StringVarP(&o.Patch, "patch", "p", "", "The patch to be applied to the resource JSON file.") cmd.Flags().StringVarP(&o.Patch, "patch", "p", "", "The patch to be applied to the resource JSON file.")
cmd.MarkFlagRequired("patch") cmd.Flags().StringVar(&o.PatchFile, "patch-file", "", "A file containing a patch to be applied to the resource.")
cmd.Flags().StringVar(&o.PatchType, "type", "strategic", fmt.Sprintf("The type of patch being provided; one of %v", sets.StringKeySet(patchTypes).List())) cmd.Flags().StringVar(&o.PatchType, "type", "strategic", fmt.Sprintf("The type of patch being provided; one of %v", sets.StringKeySet(patchTypes).List()))
cmdutil.AddDryRunFlag(cmd) cmdutil.AddDryRunFlag(cmd)
cmdutil.AddFilenameOptionFlags(cmd, &o.FilenameOptions, "identifying the resource to update") cmdutil.AddFilenameOptionFlags(cmd, &o.FilenameOptions, "identifying the resource to update")
@ -175,15 +177,18 @@ func (o *PatchOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st
} }
func (o *PatchOptions) Validate() error { func (o *PatchOptions) Validate() error {
if len(o.Patch) > 0 && len(o.PatchFile) > 0 {
return fmt.Errorf("cannot specify --patch and --patch-file together")
}
if len(o.Patch) == 0 && len(o.PatchFile) == 0 {
return fmt.Errorf("must specify --patch or --patch-file containing the contents of the patch")
}
if o.Local && len(o.args) != 0 { if o.Local && len(o.args) != 0 {
return fmt.Errorf("cannot specify --local and server resources") return fmt.Errorf("cannot specify --local and server resources")
} }
if o.Local && o.dryRunStrategy == cmdutil.DryRunServer { if o.Local && o.dryRunStrategy == cmdutil.DryRunServer {
return fmt.Errorf("cannot specify --local and --dry-run=server - did you mean --dry-run=client?") return fmt.Errorf("cannot specify --local and --dry-run=server - did you mean --dry-run=client?")
} }
if len(o.Patch) == 0 {
return fmt.Errorf("must specify -p to patch")
}
if len(o.PatchType) != 0 { if len(o.PatchType) != 0 {
if _, ok := patchTypes[strings.ToLower(o.PatchType)]; !ok { if _, ok := patchTypes[strings.ToLower(o.PatchType)]; !ok {
return fmt.Errorf("--type must be one of %v, not %q", sets.StringKeySet(patchTypes).List(), o.PatchType) return fmt.Errorf("--type must be one of %v, not %q", sets.StringKeySet(patchTypes).List(), o.PatchType)
@ -199,7 +204,18 @@ func (o *PatchOptions) RunPatch() error {
patchType = patchTypes[strings.ToLower(o.PatchType)] patchType = patchTypes[strings.ToLower(o.PatchType)]
} }
patchBytes, err := yaml.ToJSON([]byte(o.Patch)) var patchBytes []byte
if len(o.PatchFile) > 0 {
var err error
patchBytes, err = ioutil.ReadFile(o.PatchFile)
if err != nil {
return fmt.Errorf("unable to read patch file: %v", err)
}
} else {
patchBytes = []byte(o.Patch)
}
patchBytes, err := yaml.ToJSON(patchBytes)
if err != nil { if err != nil {
return fmt.Errorf("unable to parse %q: %v", o.Patch, err) return fmt.Errorf("unable to parse %q: %v", o.Patch, err)
} }