Skip to content

Perform nil check on old lb in azurecluster_validation.go #5378

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
merged 1 commit into from
Jan 18, 2025
Merged

Perform nil check on old lb in azurecluster_validation.go #5378

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1beta1/azurecluster_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ func validateAPIServerLB(lb *LoadBalancerSpec, old *LoadBalancerSpec, cidrs []st
allErrs = append(allErrs, err)
}

if len(old.FrontendIPs) != 0 && old.FrontendIPs[0].PrivateIPAddress != lb.FrontendIPs[0].PrivateIPAddress {
if old != nil && len(old.FrontendIPs) != 0 && old.FrontendIPs[0].PrivateIPAddress != lb.FrontendIPs[0].PrivateIPAddress {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("name"), "API Server load balancer private IP should not be modified after AzureCluster creation."))
}
}
Expand Down
38 changes: 19 additions & 19 deletions api/v1beta1/azurecluster_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,15 +893,15 @@ func TestValidateAPIServerLB(t *testing.T) {
testcases := []struct {
name string
featureGate featuregate.Feature
lb LoadBalancerSpec
old LoadBalancerSpec
lb *LoadBalancerSpec
old *LoadBalancerSpec
cpCIDRS []string
wantErr bool
expectedErr field.Error
}{
{
name: "invalid SKU",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
Name: "my-awesome-lb",
FrontendIPs: []FrontendIP{
{
Expand All @@ -923,7 +923,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "invalid Type",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
LoadBalancerClassSpec: LoadBalancerClassSpec{
Type: "Foo",
},
Expand All @@ -938,7 +938,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "invalid Name",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
Name: "***",
},
wantErr: true,
Expand All @@ -951,7 +951,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "too many IP configs",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
LoadBalancerClassSpec: LoadBalancerClassSpec{
Type: Public,
},
Expand Down Expand Up @@ -982,7 +982,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "too many IP configs with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
LoadBalancerClassSpec: LoadBalancerClassSpec{
Type: Public,
},
Expand Down Expand Up @@ -1012,7 +1012,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "public LB with private IP",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1035,7 +1035,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "public LB with private IP with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
Name: "my-awesome-lb",
FrontendIPs: []FrontendIP{
{
Expand All @@ -1062,7 +1062,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "internal LB with public IP",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1085,7 +1085,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "internal LB with public IP with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1107,7 +1107,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "internal LB with invalid private IP",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1131,7 +1131,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "internal LB with invalid private IP with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1154,7 +1154,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "internal LB with out of range private IP",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1179,7 +1179,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "internal LB with out of range private IP with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1203,7 +1203,7 @@ func TestValidateAPIServerLB(t *testing.T) {
},
{
name: "internal LB with in range private IP",
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand All @@ -1224,7 +1224,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "public LB with in-range private IP with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand Down Expand Up @@ -1252,7 +1252,7 @@ func TestValidateAPIServerLB(t *testing.T) {
{
name: "public LB with out of range private IP with feature flag APIServerILB enabled",
featureGate: feature.APIServerILB,
lb: LoadBalancerSpec{
lb: &LoadBalancerSpec{
FrontendIPs: []FrontendIP{
{
Name: "ip-1",
Expand Down Expand Up @@ -1282,7 +1282,7 @@ func TestValidateAPIServerLB(t *testing.T) {
if test.featureGate == feature.APIServerILB {
defer featuregatetesting.SetFeatureGateDuringTest(t, feature.Gates, test.featureGate, true)()
}
err := validateAPIServerLB(&test.lb, &test.old, test.cpCIDRS, field.NewPath("apiServerLB"))
err := validateAPIServerLB(test.lb, test.old, test.cpCIDRS, field.NewPath("apiServerLB"))
if test.wantErr {
g.Expect(err).To(ContainElement(MatchError(test.expectedErr.Error())))
} else {
Expand Down
Loading