mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 02:43:36 +00:00
vendor updates
This commit is contained in:
3
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout.go
generated
vendored
3
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout.go
generated
vendored
@ -49,7 +49,8 @@ var (
|
||||
func NewCmdRollout(f cmdutil.Factory, out, errOut io.Writer) *cobra.Command {
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "rollout SUBCOMMAND",
|
||||
Use: "rollout SUBCOMMAND",
|
||||
DisableFlagsInUseLine: true,
|
||||
Short: i18n.T("Manage the rollout of a resource"),
|
||||
Long: rollout_long,
|
||||
Example: rollout_example,
|
||||
|
3
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_history.go
generated
vendored
3
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_history.go
generated
vendored
@ -48,7 +48,8 @@ func NewCmdRolloutHistory(f cmdutil.Factory, out io.Writer) *cobra.Command {
|
||||
argAliases := kubectl.ResourceAliases(validArgs)
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "history (TYPE NAME | TYPE/NAME) [flags]",
|
||||
Use: "history (TYPE NAME | TYPE/NAME) [flags]",
|
||||
DisableFlagsInUseLine: true,
|
||||
Short: i18n.T("View rollout history"),
|
||||
Long: history_long,
|
||||
Example: history_example,
|
||||
|
23
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_pause.go
generated
vendored
23
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_pause.go
generated
vendored
@ -39,14 +39,12 @@ import (
|
||||
type PauseConfig struct {
|
||||
resource.FilenameOptions
|
||||
|
||||
Pauser func(info *resource.Info) ([]byte, error)
|
||||
Mapper meta.RESTMapper
|
||||
Typer runtime.ObjectTyper
|
||||
Encoder runtime.Encoder
|
||||
Infos []*resource.Info
|
||||
Pauser func(info *resource.Info) ([]byte, error)
|
||||
Mapper meta.RESTMapper
|
||||
Typer runtime.ObjectTyper
|
||||
Infos []*resource.Info
|
||||
|
||||
PrintSuccess func(mapper meta.RESTMapper, shortOutput bool, out io.Writer, resource, name string, dryRun bool, operation string)
|
||||
Out io.Writer
|
||||
Out io.Writer
|
||||
}
|
||||
|
||||
var (
|
||||
@ -71,7 +69,8 @@ func NewCmdRolloutPause(f cmdutil.Factory, out io.Writer) *cobra.Command {
|
||||
argAliases := kubectl.ResourceAliases(validArgs)
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "pause RESOURCE",
|
||||
Use: "pause RESOURCE",
|
||||
DisableFlagsInUseLine: true,
|
||||
Short: i18n.T("Mark the provided resource as paused"),
|
||||
Long: pause_long,
|
||||
Example: pause_example,
|
||||
@ -101,9 +100,7 @@ func (o *PauseConfig) CompletePause(f cmdutil.Factory, cmd *cobra.Command, out i
|
||||
return cmdutil.UsageErrorf(cmd, "%s", cmd.Use)
|
||||
}
|
||||
|
||||
o.PrintSuccess = f.PrintSuccess
|
||||
o.Mapper, o.Typer = f.Object()
|
||||
o.Encoder = f.JSONEncoder()
|
||||
|
||||
o.Pauser = f.Pauser
|
||||
o.Out = out
|
||||
@ -136,7 +133,7 @@ func (o *PauseConfig) CompletePause(f cmdutil.Factory, cmd *cobra.Command, out i
|
||||
|
||||
func (o PauseConfig) RunPause() error {
|
||||
allErrs := []error{}
|
||||
for _, patch := range set.CalculatePatches(o.Infos, o.Encoder, o.Pauser) {
|
||||
for _, patch := range set.CalculatePatches(o.Infos, cmdutil.InternalVersionJSONEncoder(), o.Pauser) {
|
||||
info := patch.Info
|
||||
if patch.Err != nil {
|
||||
allErrs = append(allErrs, fmt.Errorf("error: %s %q %v", info.Mapping.Resource, info.Name, patch.Err))
|
||||
@ -144,7 +141,7 @@ func (o PauseConfig) RunPause() error {
|
||||
}
|
||||
|
||||
if string(patch.Patch) == "{}" || len(patch.Patch) == 0 {
|
||||
o.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already paused")
|
||||
cmdutil.PrintSuccess(false, o.Out, info.Object, false, "already paused")
|
||||
continue
|
||||
}
|
||||
|
||||
@ -155,7 +152,7 @@ func (o PauseConfig) RunPause() error {
|
||||
}
|
||||
|
||||
info.Refresh(obj, true)
|
||||
o.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "paused")
|
||||
cmdutil.PrintSuccess(false, o.Out, info.Object, false, "paused")
|
||||
}
|
||||
|
||||
return utilerrors.NewAggregate(allErrs)
|
||||
|
15
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_resume.go
generated
vendored
15
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_resume.go
generated
vendored
@ -42,11 +42,9 @@ type ResumeConfig struct {
|
||||
Resumer func(object *resource.Info) ([]byte, error)
|
||||
Mapper meta.RESTMapper
|
||||
Typer runtime.ObjectTyper
|
||||
Encoder runtime.Encoder
|
||||
Infos []*resource.Info
|
||||
|
||||
PrintSuccess func(mapper meta.RESTMapper, shortOutput bool, out io.Writer, resource, name string, dryRun bool, operation string)
|
||||
Out io.Writer
|
||||
Out io.Writer
|
||||
}
|
||||
|
||||
var (
|
||||
@ -69,7 +67,8 @@ func NewCmdRolloutResume(f cmdutil.Factory, out io.Writer) *cobra.Command {
|
||||
argAliases := kubectl.ResourceAliases(validArgs)
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "resume RESOURCE",
|
||||
Use: "resume RESOURCE",
|
||||
DisableFlagsInUseLine: true,
|
||||
Short: i18n.T("Resume a paused resource"),
|
||||
Long: resume_long,
|
||||
Example: resume_example,
|
||||
@ -99,9 +98,7 @@ func (o *ResumeConfig) CompleteResume(f cmdutil.Factory, cmd *cobra.Command, out
|
||||
return cmdutil.UsageErrorf(cmd, "%s", cmd.Use)
|
||||
}
|
||||
|
||||
o.PrintSuccess = f.PrintSuccess
|
||||
o.Mapper, o.Typer = f.Object()
|
||||
o.Encoder = f.JSONEncoder()
|
||||
|
||||
o.Resumer = f.Resumer
|
||||
o.Out = out
|
||||
@ -140,7 +137,7 @@ func (o *ResumeConfig) CompleteResume(f cmdutil.Factory, cmd *cobra.Command, out
|
||||
|
||||
func (o ResumeConfig) RunResume() error {
|
||||
allErrs := []error{}
|
||||
for _, patch := range set.CalculatePatches(o.Infos, o.Encoder, o.Resumer) {
|
||||
for _, patch := range set.CalculatePatches(o.Infos, cmdutil.InternalVersionJSONEncoder(), o.Resumer) {
|
||||
info := patch.Info
|
||||
|
||||
if patch.Err != nil {
|
||||
@ -149,7 +146,7 @@ func (o ResumeConfig) RunResume() error {
|
||||
}
|
||||
|
||||
if string(patch.Patch) == "{}" || len(patch.Patch) == 0 {
|
||||
o.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already resumed")
|
||||
cmdutil.PrintSuccess(false, o.Out, info.Object, false, "already resumed")
|
||||
continue
|
||||
}
|
||||
|
||||
@ -160,7 +157,7 @@ func (o ResumeConfig) RunResume() error {
|
||||
}
|
||||
|
||||
info.Refresh(obj, true)
|
||||
o.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "resumed")
|
||||
cmdutil.PrintSuccess(false, o.Out, info.Object, false, "resumed")
|
||||
}
|
||||
|
||||
return utilerrors.NewAggregate(allErrs)
|
||||
|
7
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_status.go
generated
vendored
7
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_status.go
generated
vendored
@ -54,7 +54,8 @@ func NewCmdRolloutStatus(f cmdutil.Factory, out io.Writer) *cobra.Command {
|
||||
argAliases := kubectl.ResourceAliases(validArgs)
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "status (TYPE NAME | TYPE/NAME) [flags]",
|
||||
Use: "status (TYPE NAME | TYPE/NAME) [flags]",
|
||||
DisableFlagsInUseLine: true,
|
||||
Short: i18n.T("Show the status of the rollout"),
|
||||
Long: status_long,
|
||||
Example: status_example,
|
||||
@ -125,7 +126,7 @@ func RunStatus(f cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []stri
|
||||
}
|
||||
|
||||
// check if deployment's has finished the rollout
|
||||
status, done, err := statusViewer.Status(cmdNamespace, info.Name, revision)
|
||||
status, done, err := statusViewer.Status(info.Namespace, info.Name, revision)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -150,7 +151,7 @@ func RunStatus(f cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []stri
|
||||
return intr.Run(func() error {
|
||||
_, err := watch.Until(0, w, func(e watch.Event) (bool, error) {
|
||||
// print deployment's status
|
||||
status, done, err := statusViewer.Status(cmdNamespace, info.Name, revision)
|
||||
status, done, err := statusViewer.Status(info.Namespace, info.Name, revision)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
11
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_undo.go
generated
vendored
11
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollout/rollout_undo.go
generated
vendored
@ -43,8 +43,7 @@ type UndoOptions struct {
|
||||
ToRevision int64
|
||||
DryRun bool
|
||||
|
||||
PrintSuccess func(mapper meta.RESTMapper, shortOutput bool, out io.Writer, resource, name string, dryRun bool, operation string)
|
||||
Out io.Writer
|
||||
Out io.Writer
|
||||
}
|
||||
|
||||
var (
|
||||
@ -69,7 +68,8 @@ func NewCmdRolloutUndo(f cmdutil.Factory, out io.Writer) *cobra.Command {
|
||||
argAliases := kubectl.ResourceAliases(validArgs)
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "undo (TYPE NAME | TYPE/NAME) [flags]",
|
||||
Use: "undo (TYPE NAME | TYPE/NAME) [flags]",
|
||||
DisableFlagsInUseLine: true,
|
||||
Short: i18n.T("Undo a previous rollout"),
|
||||
Long: undo_long,
|
||||
Example: undo_example,
|
||||
@ -101,11 +101,10 @@ func (o *UndoOptions) CompleteUndo(f cmdutil.Factory, cmd *cobra.Command, out io
|
||||
return cmdutil.UsageErrorf(cmd, "Required resource not specified.")
|
||||
}
|
||||
|
||||
o.PrintSuccess = f.PrintSuccess
|
||||
o.ToRevision = cmdutil.GetFlagInt64(cmd, "to-revision")
|
||||
o.Mapper, o.Typer = f.Object()
|
||||
o.Out = out
|
||||
o.DryRun = cmdutil.GetFlagBool(cmd, "dry-run")
|
||||
o.DryRun = cmdutil.GetDryRunFlag(cmd)
|
||||
|
||||
cmdNamespace, enforceNamespace, err := f.DefaultNamespace()
|
||||
if err != nil {
|
||||
@ -149,7 +148,7 @@ func (o *UndoOptions) RunUndo() error {
|
||||
allErrs = append(allErrs, cmdutil.AddSourceToErr("undoing", info.Source, err))
|
||||
continue
|
||||
}
|
||||
o.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, result)
|
||||
cmdutil.PrintSuccess(false, o.Out, info.Object, false, result)
|
||||
}
|
||||
return utilerrors.NewAggregate(allErrs)
|
||||
}
|
||||
|
Reference in New Issue
Block a user