
Automatic merge from submit-queue Update kubectl create message when using --dry-run `kubectl create <resource> <name> --dry-run` provides a misleading success message. When commands such as `kubectl new-app node` are run with a `--dry-run` flag, they make this clear by appending a "(DRY RUN)" string to the final output. `kubectl create <resource> <name> --dry-run` does not do this, providing a potentially misleading output. This patch appends a "(DRY RUN)" string to the end of a successful message of `kubectl create` subcommands that support the `--dry-run` flag. `kubectl create quota quota --dry-run` ``` resourcequota "quota" created ``` `kubectl create quota quota --dry-run` ``` resourcequota "quota" created (DRY RUN) ``` **Release note**: ```release-note release-note-none ```
147 lines
4.0 KiB
Go
147 lines
4.0 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package rollout
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/renstrom/dedent"
|
|
"github.com/spf13/cobra"
|
|
|
|
"k8s.io/kubernetes/pkg/api/meta"
|
|
"k8s.io/kubernetes/pkg/kubectl"
|
|
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
|
|
"k8s.io/kubernetes/pkg/kubectl/resource"
|
|
"k8s.io/kubernetes/pkg/runtime"
|
|
utilerrors "k8s.io/kubernetes/pkg/util/errors"
|
|
)
|
|
|
|
// ResumeConfig is the start of the data required to perform the operation. As new fields are added, add them here instead of
|
|
// referencing the cmd.Flags()
|
|
type ResumeConfig struct {
|
|
resource.FilenameOptions
|
|
|
|
ResumeObject func(object runtime.Object) (bool, error)
|
|
Mapper meta.RESTMapper
|
|
Typer runtime.ObjectTyper
|
|
Infos []*resource.Info
|
|
|
|
Out io.Writer
|
|
}
|
|
|
|
var (
|
|
resume_long = dedent.Dedent(`
|
|
Resume a paused resource
|
|
|
|
Paused resources will not be reconciled by a controller. By resuming a
|
|
resource, we allow it to be reconciled again.
|
|
Currently only deployments support being resumed.`)
|
|
|
|
resume_example = dedent.Dedent(`
|
|
# Resume an already paused deployment
|
|
kubectl rollout resume deployment/nginx`)
|
|
)
|
|
|
|
func NewCmdRolloutResume(f *cmdutil.Factory, out io.Writer) *cobra.Command {
|
|
options := &ResumeConfig{}
|
|
|
|
validArgs := []string{"deployment"}
|
|
argAliases := kubectl.ResourceAliases(validArgs)
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "resume RESOURCE",
|
|
Short: "Resume a paused resource",
|
|
Long: resume_long,
|
|
Example: resume_example,
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
allErrs := []error{}
|
|
err := options.CompleteResume(f, cmd, out, args)
|
|
if err != nil {
|
|
allErrs = append(allErrs, err)
|
|
}
|
|
err = options.RunResume()
|
|
if err != nil {
|
|
allErrs = append(allErrs, err)
|
|
}
|
|
cmdutil.CheckErr(utilerrors.Flatten(utilerrors.NewAggregate(allErrs)))
|
|
},
|
|
ValidArgs: validArgs,
|
|
ArgAliases: argAliases,
|
|
}
|
|
|
|
usage := "identifying the resource to get from a server."
|
|
cmdutil.AddFilenameOptionFlags(cmd, &options.FilenameOptions, usage)
|
|
return cmd
|
|
}
|
|
|
|
func (o *ResumeConfig) CompleteResume(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []string) error {
|
|
if len(args) == 0 && cmdutil.IsFilenameEmpty(o.Filenames) {
|
|
return cmdutil.UsageError(cmd, cmd.Use)
|
|
}
|
|
|
|
o.Mapper, o.Typer = f.Object()
|
|
o.ResumeObject = f.ResumeObject
|
|
o.Out = out
|
|
|
|
cmdNamespace, enforceNamespace, err := f.DefaultNamespace()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
r := resource.NewBuilder(o.Mapper, o.Typer, resource.ClientMapperFunc(f.ClientForMapping), f.Decoder(true)).
|
|
NamespaceParam(cmdNamespace).DefaultNamespace().
|
|
FilenameParam(enforceNamespace, &o.FilenameOptions).
|
|
ResourceTypeOrNameArgs(true, args...).
|
|
ContinueOnError().
|
|
Latest().
|
|
Flatten().
|
|
Do()
|
|
err = r.Err()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = r.Visit(func(info *resource.Info, err error) error {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
o.Infos = append(o.Infos, info)
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (o ResumeConfig) RunResume() error {
|
|
allErrs := []error{}
|
|
for _, info := range o.Infos {
|
|
isAlreadyResumed, err := o.ResumeObject(info.Object)
|
|
if err != nil {
|
|
allErrs = append(allErrs, cmdutil.AddSourceToErr("resuming", info.Source, err))
|
|
continue
|
|
}
|
|
if isAlreadyResumed {
|
|
cmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "already resumed")
|
|
continue
|
|
}
|
|
cmdutil.PrintSuccess(o.Mapper, false, o.Out, info.Mapping.Resource, info.Name, false, "resumed")
|
|
}
|
|
return utilerrors.NewAggregate(allErrs)
|
|
}
|