update validation for conflict

Author: salonichf5

apis/v1alpha1/upstreamsettingspolicy_types.go

@@ -137,7 +137,7 @@ const (
 	// distributing requests evenly across all upstream servers.
 	LoadBalancingTypeRoundRobin LoadBalancingType = "round_robin"
 
-	// LoadBalancingTypeLeastConn enables least-connections load balancing,
+	// LoadBalancingTypeLeastConnection enables least-connections load balancing,
 	// routing requests to the upstream server with the fewest active connections.
 	LoadBalancingTypeLeastConnection LoadBalancingType = "least_conn"
 

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

@@ -91,23 +91,23 @@ func conflicts(a, b ngfAPI.UpstreamSettingsPolicySpec) bool {
 		}
 	}
 
-	if !checkConflictForLoadBalancingFields(a, b) {
+	if checkConflictsForLoadBalancingFields(a, b) {
 		return true
 	}
 
 	return false
 }
 
-func checkConflictForLoadBalancingFields(a, b ngfAPI.UpstreamSettingsPolicySpec) bool {
+func checkConflictsForLoadBalancingFields(a, b ngfAPI.UpstreamSettingsPolicySpec) bool {
 	if a.LoadBalancingMethod != nil && b.LoadBalancingMethod != nil {
-		return *a.LoadBalancingMethod == *b.LoadBalancingMethod
+		return true
 	}
 
 	if a.HashMethodKey != nil && b.HashMethodKey != nil {
-		return *a.HashMethodKey == *b.HashMethodKey
+		return true
 	}
 
-	return true
+	return false
 }
 
 // validateSettings performs validation on fields in the spec that are vulnerable to code injection.