Skip to content

MachinePools/OpenStack: Fix nil pointer exception #2253

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
openshift-merge-bot merged 2 commits into from
Apr 27, 2024
Merged

MachinePools/OpenStack: Fix nil pointer exception #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b37ee
Revendor installer to v0.9.0-master.0.20240405164943-304af6735c65
2uasimojo Apr 5, 2024
f59f327
MachinePools/OpenStack: UT for nil pointer exception fix
2uasimojo Apr 2, 2024
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
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/IBM/go-sdk-core/v5 v5.16.3
github.com/IBM/networking-go-sdk v0.45.0
github.com/IBM/platform-services-go-sdk v0.61.3
github.com/IBM/vpc-go-sdk v0.49.1
github.com/IBM/platform-services-go-sdk v0.62.0
github.com/IBM/vpc-go-sdk v0.50.0
github.com/aws/aws-sdk-go v1.50.25
github.com/blang/semver/v4 v4.0.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
Expand Down Expand Up @@ -42,7 +42,7 @@ require (
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
github.com/openshift/generic-admission-server v1.14.1-0.20231020105858-8dcc3c9b298f
github.com/openshift/hive/apis v0.0.0
github.com/openshift/installer v0.9.0-master.0.20240327042757-ca7135891152
github.com/openshift/installer v0.9.0-master.0.20240405164943-304af6735c65
github.com/openshift/library-go v0.0.0-20240207105404-126b47137408
github.com/openshift/machine-api-operator v0.2.1-0.20230929171041-2cc7fcf262f3
github.com/openshift/machine-api-provider-gcp v0.0.1-0.20231014045125-6096cc86f3ba
Expand Down Expand Up @@ -140,7 +140,7 @@ require (
4d63.com/gochecknoglobals v0.2.1 // indirect
github.com/AlecAivazis/survey/v2 v2.3.5 // indirect
github.com/Antonboom/errname v0.1.12 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.4.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZM
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 h1:6oNBlSdi1QqM1PNW7FPA6xOGA5UNsXnkaYZz9vdPGhA=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.4.0 h1:QfV5XZt6iNa2aWMAt96CZEbfJ7kgG/qYIpq465Shr5E=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.4.0/go.mod h1:uYt4CfhkJA9o0FN7jfE5minm/i4nUE4MjGUJkzB6Zs8=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0 h1:MxA59PGoCFb+vCwRQi3PhQEwHj4+r2dhuv9HG+vM7iM=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0/go.mod h1:uYt4CfhkJA9o0FN7jfE5minm/i4nUE4MjGUJkzB6Zs8=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0/go.mod h1:LRr2FzBTQlONPPa5HREE5+RjSCTXl7BwOvYOaWTqCaI=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o=
Expand Down Expand Up @@ -686,10 +686,10 @@ github.com/IBM/keyprotect-go-client v0.12.2 h1:Cjxcqin9Pl0xz3MnxdiVd4v/eIa79xL3h
github.com/IBM/keyprotect-go-client v0.12.2/go.mod h1:yr8h2noNgU8vcbs+vhqoXp3Lmv73PI0zAc6VMgFvWwM=
github.com/IBM/networking-go-sdk v0.45.0 h1:tYgDhVDpgKvELNY7tcodbZ4ny9fatpEWM6PwtQcDe20=
github.com/IBM/networking-go-sdk v0.45.0/go.mod h1:NnJPA1e5GWr5opJe+5Hs6e1G6RcBIFz64TrkZsdnSp8=
github.com/IBM/platform-services-go-sdk v0.61.3 h1:Us2fDckodXFI3NA67BerMVFKEai0MOL2vMqzut6qiik=
github.com/IBM/platform-services-go-sdk v0.61.3/go.mod h1:fd7gUOmsuQYhYLTZVLL+posObT/ISxVV+6JzsfDs5qE=
github.com/IBM/vpc-go-sdk v0.49.1 h1:VIkZ8iJMBHqBulUXcPtN0ifxsa0xwlBtaLslU2V9HsY=
github.com/IBM/vpc-go-sdk v0.49.1/go.mod h1:iBg9UJY1y/XpkweyP6YH7G6guzKPV8BYDoBMTdPupH4=
github.com/IBM/platform-services-go-sdk v0.62.0 h1:IA7kerhjqHHCSirXsLveX6Bk6DnUOA7Z9zaMqLZ5iBY=
github.com/IBM/platform-services-go-sdk v0.62.0/go.mod h1:fd7gUOmsuQYhYLTZVLL+posObT/ISxVV+6JzsfDs5qE=
github.com/IBM/vpc-go-sdk v0.50.0 h1:+vnXYK0FXFXYqaS/5/X1XEqH0bbRotkzkerRk21ZEjE=
github.com/IBM/vpc-go-sdk v0.50.0/go.mod h1:iBg9UJY1y/XpkweyP6YH7G6guzKPV8BYDoBMTdPupH4=
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
Expand Down Expand Up @@ -1756,8 +1756,8 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
github.com/openshift/generic-admission-server v1.14.1-0.20231020105858-8dcc3c9b298f h1:LzKRLvLJkWW4+4KsuvMmXJQ81ZZJSm2xxu6jwtn5gN0=
github.com/openshift/generic-admission-server v1.14.1-0.20231020105858-8dcc3c9b298f/go.mod h1:/CLsleDcQ6AFTGKJe9VL3Y4rB9DqX3fQwQv47q2/ZJc=
github.com/openshift/installer v0.9.0-master.0.20240327042757-ca7135891152 h1:8MX2IYRe5MRM1qRdNltsU+MVBIT8A0cLkfXX8FoD/vE=
github.com/openshift/installer v0.9.0-master.0.20240327042757-ca7135891152/go.mod h1:Uo4q2FXXPcIpQ7/Z8KBUd8SuTbV5ZUOdIHx1ND/L6BA=
github.com/openshift/installer v0.9.0-master.0.20240405164943-304af6735c65 h1:Kfj+y+YE0EMOPpd7PkcUb9JXoApSf1qU0dNvdjfa7Pk=
github.com/openshift/installer v0.9.0-master.0.20240405164943-304af6735c65/go.mod h1:P4jkk+gG3ovxgYlMZCiJDZ0fOX/iGXsAJj0PxF+yoA4=
github.com/openshift/library-go v0.0.0-20210811133500-5e31383de2a7/go.mod h1:3GagmGg6gikg+hAqma7E7axBzs2pjx4+GrAbdl4OYdY=
github.com/openshift/library-go v0.0.0-20240207105404-126b47137408 h1:Evg6GEvEuyj9toFX14YenXI6hGRnhLWqYx/rHO7VnQ4=
github.com/openshift/library-go v0.0.0-20240207105404-126b47137408/go.mod h1:ePlaOqUiPplRc++6aYdMe+2FmXb2xTNS9Nz5laG2YmI=
Expand Down
50 changes: 33 additions & 17 deletions pkg/controller/machinepool/openstackactuator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,26 @@ func TestOpenStackActuator(t *testing.T) {
fmt.Sprintf("%s-worker-%d", testInfraID, 0): 3,
},
},
{
name: "autoscaling baseline",
clusterDeployment: testOSPClusterDeployment(),
pool: testOSPPool(testmp.WithAutoscaling(5, 7)),
expectedMachineSetReplicas: map[string]int64{
// NOTE: When autoscaling, our input has Replicas unspecified, whereupon
// the installer's MachineSets() func will produce one MachineSet per
// Zone (default 1, since we don't support multiple zones yet) with zero
// replicas each.
fmt.Sprintf("%s-worker-%d", testInfraID, 0): 0,
},
},
{
name: "autoscaling with zero min replicas",
clusterDeployment: testOSPClusterDeployment(),
pool: testOSPPool(testmp.WithAutoscaling(0, 3)),
expectedMachineSetReplicas: map[string]int64{
fmt.Sprintf("%s-worker-%d", testInfraID, 0): 0,
},
},
}
cloudBytes, _ := yaml.Marshal(clientconfig.Clouds{
Clouds: map[string]clientconfig.Cloud{
Expand Down Expand Up @@ -78,7 +98,19 @@ func TestOpenStackActuator(t *testing.T) {
assert.Error(t, err, "expected error for test case")
} else {
require.NoError(t, err, "unexpected error for test case")
validateOSPMachineSets(t, generatedMachineSets, test.expectedMachineSetReplicas)
assert.Equal(t, len(test.expectedMachineSetReplicas), len(generatedMachineSets), "different number of machine sets generated than expected")
for _, ms := range generatedMachineSets {
expectedReplicas, ok := test.expectedMachineSetReplicas[ms.Name]
if assert.True(t, ok, "unexpected machine set: %s", ms.Name) {
assert.Equal(t, expectedReplicas, int64(*ms.Spec.Replicas), "replica mismatch for MachineSet %s", ms.Name)
}

ospProvider, ok := ms.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1alpha1.OpenstackProviderSpec)
if assert.True(t, ok, "failed to convert to openstack provider spec") {
assert.Equal(t, "Flav", ospProvider.Flavor, "unexpected instance type")
}
}

}
})
}
Expand Down Expand Up @@ -231,22 +263,6 @@ rootVolume:
}
}

func validateOSPMachineSets(t *testing.T, mSets []*machinev1beta1.MachineSet, expectedMSReplicas map[string]int64) {
assert.Equal(t, len(expectedMSReplicas), len(mSets), "different number of machine sets generated than expected")

for _, ms := range mSets {
expectedReplicas, ok := expectedMSReplicas[ms.Name]
if assert.True(t, ok, "unexpected machine set: %s", ms.Name) {
assert.Equal(t, expectedReplicas, int64(*ms.Spec.Replicas), "replica mismatch for MachineSet %s", ms.Name)
}

ospProvider, ok := ms.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1alpha1.OpenstackProviderSpec)
if assert.True(t, ok, "failed to convert to openstack provider spec") {
assert.Equal(t, "Flav", ospProvider.Flavor, "unexpected instance type")
}
}
}

func testOSPPool(opts ...testmp.Option) *hivev1.MachinePool {
p := testMachinePool(opts...)
p.Spec.Platform = hivev1.MachinePoolPlatform{
Expand Down
Loading