Skip to content

fix: Don't try to update root size when it's unset #726

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

Merged
k8s-ci-robot merged 3 commits into from
Apr 25, 2019
Merged

fix: Don't try to update root size when it's unset #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfa0c4d
fix: Don't try to update root size when it's unset
sethp-nr Apr 18, 2019
a454510
fix: updates without specifying a root volume size
sethp-nr Apr 22, 2019
9cca0f6
fix: updates without specifying a root volume size
sethp-nr Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cloud/aws/actuators/machine/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func (a *Actuator) isMachineOutdated(machineSpec *v1alpha1.AWSMachineProviderSpe
}

// Root Device Size
if machineSpec.RootDeviceSize != instance.RootDeviceSize {
if machineSpec.RootDeviceSize > 0 && machineSpec.RootDeviceSize != instance.RootDeviceSize {
Comment thread
sethp-nr marked this conversation as resolved.
errs = append(errs, errors.Errorf("Root volume size cannot be mutated from %v to %v", instance.RootDeviceSize, machineSpec.RootDeviceSize))
}

Expand Down
9 changes: 9 additions & 0 deletions pkg/cloud/aws/actuators/machine/actuator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,15 @@ func TestImmutableStateChange(t *testing.T) {
},
expected: 1,
},
{
name: "root device size is omitted",
machineSpec: v1alpha1.AWSMachineProviderSpec{},
instance: v1alpha1.Instance{
// All instances have a root device size, even when we don't set one
RootDeviceSize: 12,
},
expected: 0,
},
{
name: "root device size is unchanged",
machineSpec: v1alpha1.AWSMachineProviderSpec{
Expand Down