Skip to content

Commit 03c61d2

Browse files
committed
remove validation checks for spec changes
1 parent d113907 commit 03c61d2

File tree

2 files changed

+0
-40
lines changed

2 files changed

+0
-40
lines changed

internal/controller/nginx/config/policies/upstreamsettings/validator.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,6 @@ func (v Validator) validateSettings(spec ngfAPI.UpstreamSettingsPolicySpec) erro
107107
allErrs = append(allErrs, v.validateUpstreamKeepAlive(*spec.KeepAlive, fieldPath.Child("keepAlive"))...)
108108
}
109109

110-
if spec.LoadBalancingMethod != nil {
111-
allErrs = append(
112-
allErrs,
113-
v.validateLoadBalancingMethod(*spec.LoadBalancingMethod, fieldPath.Child("loadBalancingMethod"))...,
114-
)
115-
}
116-
117110
return allErrs.ToAggregate()
118111
}
119112

@@ -141,25 +134,3 @@ func (v Validator) validateUpstreamKeepAlive(
141134

142135
return allErrs
143136
}
144-
145-
func (v Validator) validateLoadBalancingMethod(
146-
method ngfAPI.LoadBalancingType,
147-
fieldPath *field.Path,
148-
) field.ErrorList {
149-
var allErrs field.ErrorList
150-
151-
switch method {
152-
case ngfAPI.LoadBalancingTypeIPHash, ngfAPI.LoadBalancingTypeRandomTwoLeastConnection:
153-
default:
154-
allErrs = append(allErrs, field.NotSupported(
155-
fieldPath,
156-
method,
157-
[]string{
158-
string(ngfAPI.LoadBalancingTypeIPHash),
159-
string(ngfAPI.LoadBalancingTypeRandomTwoLeastConnection),
160-
},
161-
))
162-
}
163-
164-
return allErrs
165-
}

internal/controller/nginx/config/policies/upstreamsettings/validator_test.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,6 @@ func TestValidator_Validate(t *testing.T) {
118118
"'must contain an, at most, four digit number followed by 'ms', 's', 'm', or 'h'')]"),
119119
},
120120
},
121-
{
122-
name: "invalid load balancing method",
123-
policy: createModifiedPolicy(func(p *ngfAPI.UpstreamSettingsPolicy) *ngfAPI.UpstreamSettingsPolicy {
124-
p.Spec.LoadBalancingMethod = helpers.GetPointer[ngfAPI.LoadBalancingType]("invalid-lb-method")
125-
return p
126-
}),
127-
expConditions: []conditions.Condition{
128-
conditions.NewPolicyInvalid("spec.loadBalancingMethod: Unsupported value: \"invalid-lb-method\": " +
129-
"supported values: \"ip_hash\", \"random two least_conn\""),
130-
},
131-
},
132121
{
133122
name: "valid",
134123
policy: createValidPolicy(),

0 commit comments

Comments
 (0)