mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-06-09 00:34:10 -04:00
kubeadm: fix a bug where the node.skipPhases in UpgradeNodeConfiguration is not respected by 'kubeadm upgrade node'
This commit is contained in:
parent
ec0d04b10e
commit
ec1a3974ba
1 changed files with 17 additions and 1 deletions
|
|
@ -17,6 +17,7 @@ limitations under the License.
|
|||
package upgrade
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
|
|
@ -83,7 +84,22 @@ func newCmdNode(out io.Writer) *cobra.Command {
|
|||
return err
|
||||
}
|
||||
|
||||
return nodeRunner.Run(args)
|
||||
data, err := nodeRunner.InitData(args)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, ok := data.(*nodeData); !ok {
|
||||
return errors.New("invalid data struct")
|
||||
}
|
||||
if err := nodeRunner.Run(args); err != nil {
|
||||
return err
|
||||
}
|
||||
if nodeOptions.dryRun {
|
||||
fmt.Println("[upgrade/successful] Finished dryrunning successfully!")
|
||||
return nil
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Args: cobra.NoArgs,
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue