Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm: unhide the logic for non-interactiveness #74131

Merged
merged 1 commit into from
Feb 15, 2019
Merged

kubeadm: unhide the logic for non-interactiveness #74131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 5 additions & 10 deletions cmd/kubeadm/app/cmd/upgrade/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ type applyFlags struct {
imagePullTimeout time.Duration
}

// SessionIsInteractive returns true if the session is of an interactive type (the default, can be opted out of with -y, -f or --dry-run)
func (f *applyFlags) SessionIsInteractive() bool {
return !f.nonInteractiveMode
// sessionIsInteractive returns true if the session is of an interactive type (the default, can be opted out of with -y, -f or --dry-run)
func (f *applyFlags) sessionIsInteractive() bool {
return !(f.nonInteractiveMode || f.dryRun || f.force)
}

// NewCmdApply returns the cobra command for `kubeadm upgrade apply`
Expand Down Expand Up @@ -185,8 +185,8 @@ func runApply(flags *applyFlags) error {
return errors.Wrap(err, "[upgrade/version] FATAL")
}

// If the current session is interactive, ask the user whether they really want to upgrade
if flags.SessionIsInteractive() {
// If the current session is interactive, ask the user whether they really want to upgrade.
if flags.sessionIsInteractive() {
if err := InteractivelyConfirmUpgrade("Are you sure you want to proceed with the upgrade?"); err != nil {
return err
}
Expand Down Expand Up @@ -233,11 +233,6 @@ func runApply(flags *applyFlags) error {

// SetImplicitFlags handles dynamically defaulting flags based on each other's value
func SetImplicitFlags(flags *applyFlags) error {
// If we are in dry-run or force mode; we should automatically execute this command non-interactively
if flags.dryRun || flags.force {
flags.nonInteractiveMode = true
}

if len(flags.newK8sVersionStr) == 0 {
return errors.New("version string can't be empty")
}
Expand Down
132 changes: 42 additions & 90 deletions cmd/kubeadm/app/cmd/upgrade/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,96 +33,6 @@ func TestSetImplicitFlags(t *testing.T) {
expectedFlags applyFlags
errExpected bool
}{
{
name: "if not dryRun or force is set; the nonInteractiveMode field should not be touched",
flags: &applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: false,
force: false,
nonInteractiveMode: false,
},
expectedFlags: applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: false,
force: false,
nonInteractiveMode: false,
},
},
{
name: "if not dryRun or force is set; the nonInteractiveMode field should not be touched",
flags: &applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: false,
force: false,
nonInteractiveMode: true,
},
expectedFlags: applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: false,
force: false,
nonInteractiveMode: true,
},
},
{
name: "if dryRun or force is set; the nonInteractiveMode field should be set to true",
flags: &applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: true,
force: false,
nonInteractiveMode: false,
},
expectedFlags: applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: true,
force: false,
nonInteractiveMode: true,
},
},
{
name: "if dryRun or force is set; the nonInteractiveMode field should be set to true",
flags: &applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: false,
force: true,
nonInteractiveMode: false,
},
expectedFlags: applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: false,
force: true,
nonInteractiveMode: true,
},
},
{
name: "if dryRun or force is set; the nonInteractiveMode field should be set to true",
flags: &applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: true,
force: true,
nonInteractiveMode: false,
},
expectedFlags: applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: true,
force: true,
nonInteractiveMode: true,
},
},
{
name: "if dryRun or force is set; the nonInteractiveMode field should be set to true",
flags: &applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: true,
force: true,
nonInteractiveMode: true,
},
expectedFlags: applyFlags{
newK8sVersionStr: "v1.8.0",
dryRun: true,
force: true,
nonInteractiveMode: true,
},
},
{
name: "if the new version is empty; it should error out",
flags: &applyFlags{
Expand Down Expand Up @@ -161,6 +71,48 @@ func TestSetImplicitFlags(t *testing.T) {
}
}

func TestSessionIsInteractive(t *testing.T) {
var tcases = []struct {
name string
flags *applyFlags
expected bool
}{
{
name: "Explicitly non-interactive",
flags: &applyFlags{
nonInteractiveMode: true,
},
expected: false,
},
{
name: "Implicitly non-interactive since --dryRun is used",
flags: &applyFlags{
dryRun: true,
},
expected: false,
},
{
name: "Implicitly non-interactive since --force is used",
flags: &applyFlags{
force: true,
},
expected: false,
},
{
name: "Interactive session",
flags: &applyFlags{},
expected: true,
},
}
for _, tt := range tcases {
t.Run(tt.name, func(t *testing.T) {
if tt.flags.sessionIsInteractive() != tt.expected {
t.Error("unexpected result")
}
})
}
}

func TestGetPathManagerForUpgrade(t *testing.T) {

haEtcd := &kubeadmapi.InitConfiguration{
Expand Down