mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-05 23:47:50 +00:00
Merge pull request #64118 from deads2k/cli-65-podspec
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. move updatepodspecforobject out of factory Updating a podspec is a polymorphic helper, but it isn't a factory method. @kubernetes/sig-cli-maintainers /assign @juanvallejo ```release-note NONE ```
This commit is contained in:
@@ -36,6 +36,7 @@ import (
|
||||
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
|
||||
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
|
||||
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
|
||||
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
)
|
||||
|
||||
@@ -114,7 +115,7 @@ type EnvOptions struct {
|
||||
output string
|
||||
dryRun bool
|
||||
builder func() *resource.Builder
|
||||
updatePodSpecForObject func(obj runtime.Object, fn func(*v1.PodSpec) error) (bool, error)
|
||||
updatePodSpecForObject polymorphichelpers.UpdatePodSpecForObjectFunc
|
||||
namespace string
|
||||
enforceNamespace bool
|
||||
clientset *kubernetes.Clientset
|
||||
@@ -192,7 +193,7 @@ func (o *EnvOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []stri
|
||||
return fmt.Errorf("all resources must be specified before environment changes: %s", strings.Join(args, " "))
|
||||
}
|
||||
|
||||
o.updatePodSpecForObject = f.UpdatePodSpecForObject
|
||||
o.updatePodSpecForObject = polymorphichelpers.UpdatePodSpecForObjectFn
|
||||
o.output = cmdutil.GetFlagString(cmd, "output")
|
||||
o.dryRun = cmdutil.GetDryRunFlag(cmd)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user