Skip to content

K
k3s
Commit 5c6c8eb9 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29531 from AdoHe/rolling_update_panic

Automatic merge from submit-queue fix kubectl rolling update empty file cause panic issue ```release-note Fix issue with kubectl panicing when passed files that do not exist. ``` Fix #29398 @pwittrock @justinsb ptal. This just fix on the cmd layer, I am thinking whether we should return err from marshal&unmarshal if the reader is empty.
parents 685fc92f 0949e083
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/kubectl/cmd/rollingupdate.go
View file @ 5c6c8eb9
...@@ -220,6 +220,9 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg ...@@ -220,6 +220,9 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg
if len(list.Items) > 1 { if len(list.Items) > 1 {
return cmdutil.UsageError(cmd, "%s specifies multiple items", filename) return cmdutil.UsageError(cmd, "%s specifies multiple items", filename)
} }
if len(list.Items) == 0 {
return cmdutil.UsageError(cmd, "please make sure %s exists and is not empty", filename)
}
obj = list.Items[0] obj = list.Items[0]
} }
newRc, ok = obj.(*api.ReplicationController) newRc, ok = obj.(*api.ReplicationController)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment