Small fixes

Author: Kate Osborn

apis/v1alpha1/clientsettingspolicy_types.go

@@ -36,15 +36,6 @@ type ClientSettingsPolicyList struct {
 
 // ClientSettingsPolicySpec defines the desired state of ClientSettingsPolicy.
 type ClientSettingsPolicySpec struct {
-	// TargetRef identifies an API object to apply the policy to.
-	// Object must be in the same namespace as the policy.
-	// Support: Gateway, HTTPRoute, GRPCRoute.
-	//
-	// +kubebuilder:validation:XValidation:message="TargetRef Kind must be one of: Gateway, HTTPRoute, or GRPCRoute",rule="(self.kind=='Gateway' || self.kind=='HTTPRoute' || self.kind=='GRPCRoute')"
-	// +kubebuilder:validation:XValidation:message="TargetRef Group must be gateway.networking.k8s.io.",rule="(self.group=='gateway.networking.k8s.io')"
-	//nolint:lll
-	TargetRef gatewayv1alpha2.LocalPolicyTargetReference `json:"targetRef"`
-
 	// Body defines the client request body settings.
 	//
 	// +optional
@@ -54,6 +45,15 @@ type ClientSettingsPolicySpec struct {
 	//
 	// +optional
 	KeepAlive *ClientKeepAlive `json:"keepAlive,omitempty"`
+
+	// TargetRef identifies an API object to apply the policy to.
+	// Object must be in the same namespace as the policy.
+	// Support: Gateway, HTTPRoute, GRPCRoute.
+	//
+	// +kubebuilder:validation:XValidation:message="TargetRef Kind must be one of: Gateway, HTTPRoute, or GRPCRoute",rule="(self.kind=='Gateway' || self.kind=='HTTPRoute' || self.kind=='GRPCRoute')"
+	// +kubebuilder:validation:XValidation:message="TargetRef Group must be gateway.networking.k8s.io.",rule="(self.group=='gateway.networking.k8s.io')"
+	//nolint:lll
+	TargetRef gatewayv1alpha2.LocalPolicyTargetReference `json:"targetRef"`
 }
 
 // ClientBody contains the settings for the client request body.

internal/mode/static/nginx/config/servers_test.go

@@ -999,7 +999,7 @@ func TestCreateServers(t *testing.T) {
 			{
 				Path:            "= /addition-path-only-match",
 				ProxyPass:       "http://test_foo_80$request_uri",
-				ProxySetHeaders: baseHeaders,
+				ProxySetHeaders: httpBaseHeaders,
 				Includes: []http.Include{
 					{
 						Filename: includesFolder + "/path-only-match-addition.conf",

internal/mode/static/policies/clientsettings/validator.go

@@ -32,7 +32,7 @@ func (v *Validator) Validate(policy policies.Policy) error {
 		panic(fmt.Sprintf("expected ClientSettingsPolicy, got: %T", policy))
 	}
 
-	if err := validateTargetRef(csp.Spec.TargetRef, csp.Namespace); err != nil {
+	if err := validateTargetRef(csp.Spec.TargetRef); err != nil {
 		return err
 	}
 
@@ -79,7 +79,7 @@ func conflicts(a, b ngfAPI.ClientSettingsPolicySpec) bool {
 	return false
 }
 
-func validateTargetRef(ref v1alpha2.LocalPolicyTargetReference, policyNs string) error {
+func validateTargetRef(ref v1alpha2.LocalPolicyTargetReference) error {
 	basePath := field.NewPath("spec").Child("targetRef")
 
 	if ref.Group != gatewayv1.GroupName {