Use v1 ParentRef

Author: Kate Osborn

internal/mode/static/state/graph/graph_test.go

@@ -363,7 +363,7 @@ func TestBuildGraph(t *testing.T) {
 	processedRoutePolicy := &Policy{
 		Source: hrPolicy,
 		Ancestor: &PolicyAncestor{
-			Ancestor: v1alpha2.ParentReference{
+			Ancestor: gatewayv1.ParentReference{
 				Group:     helpers.GetPointer[gatewayv1.Group](gatewayv1.GroupName),
 				Kind:      helpers.GetPointer[gatewayv1.Kind](kinds.HTTPRoute),
 				Namespace: (*gatewayv1.Namespace)(&testNs),
@@ -392,7 +392,7 @@ func TestBuildGraph(t *testing.T) {
 	processedGwPolicy := &Policy{
 		Source: gwPolicy,
 		Ancestor: &PolicyAncestor{
-			Ancestor: v1alpha2.ParentReference{
+			Ancestor: gatewayv1.ParentReference{
 				Group:     helpers.GetPointer[gatewayv1.Group](gatewayv1.GroupName),
 				Kind:      helpers.GetPointer[gatewayv1.Kind](kinds.Gateway),
 				Namespace: (*gatewayv1.Namespace)(&testNs),

internal/mode/static/state/graph/policies.go

@@ -8,7 +8,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
-	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions"
 	"github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds"
@@ -37,7 +36,7 @@ type Policy struct {
 // PolicyAncestor represents an ancestor of a Policy.
 type PolicyAncestor struct {
 	// Ancestor is the ancestor object.
-	Ancestor v1alpha2.ParentReference
+	Ancestor v1.ParentReference
 	// Conditions contains the list of conditions of the Policy in relation to the ancestor.
 	Conditions []conditions.Condition
 }

internal/mode/static/state/graph/policy_ancestor.go

@@ -10,7 +10,7 @@ import (
 
 func ancestorsFull(
 	ancestors []v1alpha2.PolicyAncestorStatus,
-	newAncestor v1alpha2.ParentReference,
+	newAncestor v1.ParentReference,
 	ctlrName string,
 ) bool {
 	if len(ancestors) < 16 {

internal/mode/static/state/graph/policy_ancestor_test.go

@@ -19,7 +19,7 @@ func TestAncestorsFull(t *testing.T) {
 
 		for i := 0; i < numAncestors; i++ {
 			statuses = append(statuses, v1alpha2.PolicyAncestorStatus{
-				AncestorRef: v1alpha2.ParentReference{
+				AncestorRef: v1.ParentReference{
 					Group:     helpers.GetPointer[v1.Group](v1.GroupName),
 					Kind:      helpers.GetPointer[v1.Kind](kinds.Gateway),
 					Namespace: (*v1.Namespace)(&ns),
@@ -33,15 +33,15 @@ func TestAncestorsFull(t *testing.T) {
 	}
 
 	tests := []struct {
-		newAncestor v1alpha2.ParentReference
+		newAncestor v1.ParentReference
 		name        string
 		curStatus   []v1alpha2.PolicyAncestorStatus
 		expFull     bool
 	}{
 		{
 			name:      "not full",
 			curStatus: createCurStatus(15, "controller"),
-			newAncestor: v1alpha2.ParentReference{
+			newAncestor: v1.ParentReference{
 				Group:     helpers.GetPointer[v1.Group](v1.GroupName),
 				Kind:      helpers.GetPointer[v1.Kind](kinds.Gateway),
 				Namespace: (*v1.Namespace)(&ns),
@@ -52,7 +52,7 @@ func TestAncestorsFull(t *testing.T) {
 		{
 			name:      "full; ancestor does not exist in current status",
 			curStatus: createCurStatus(16, "controller"),
-			newAncestor: v1alpha2.ParentReference{
+			newAncestor: v1.ParentReference{
 				Group:     helpers.GetPointer[v1.Group](v1.GroupName),
 				Kind:      helpers.GetPointer[v1.Kind](kinds.Gateway),
 				Namespace: (*v1.Namespace)(&ns),
@@ -63,7 +63,7 @@ func TestAncestorsFull(t *testing.T) {
 		{
 			name:      "full, but ancestor does exist in current status",
 			curStatus: createCurStatus(16, "nginx-gateway"),
-			newAncestor: v1alpha2.ParentReference{
+			newAncestor: v1.ParentReference{
 				Group:     helpers.GetPointer[v1.Group](v1.GroupName),
 				Kind:      helpers.GetPointer[v1.Kind](kinds.Gateway),
 				Namespace: (*v1.Namespace)(&ns),
@@ -88,7 +88,7 @@ func TestAncestorStatusExists(t *testing.T) {
 		ns := "test"
 
 		return v1alpha2.PolicyAncestorStatus{
-			AncestorRef: v1alpha2.ParentReference{
+			AncestorRef: v1.ParentReference{
 				Group:     helpers.GetPointer[v1.Group](v1.GroupName),
 				Kind:      helpers.GetPointer[v1.Kind](kinds.Gateway),
 				Namespace: (*v1.Namespace)(&ns),

internal/mode/static/status/prepare_requests_test.go

@@ -1422,7 +1422,7 @@ func TestBuildNGFPolicyStatuses(t *testing.T) {
 	validPolicyCfg := policyCfg{
 		Name: validPolicyKey.NsName.Name,
 		Ancestor: &graph.PolicyAncestor{
-			Ancestor: v1alpha2.ParentReference{
+			Ancestor: v1.ParentReference{
 				Name: "ancestor",
 			},
 		},
@@ -1436,7 +1436,7 @@ func TestBuildNGFPolicyStatuses(t *testing.T) {
 		Name:       invalidPolicyKey.NsName.Name,
 		Conditions: invalidConds,
 		Ancestor: &graph.PolicyAncestor{
-			Ancestor: v1alpha2.ParentReference{
+			Ancestor: v1.ParentReference{
 				Name: "ancestor",
 			},
 		},
@@ -1449,7 +1449,7 @@ func TestBuildNGFPolicyStatuses(t *testing.T) {
 	targetRefNotFoundPolicyCfg := policyCfg{
 		Name: targetRefNotFoundPolicyKey.NsName.Name,
 		Ancestor: &graph.PolicyAncestor{
-			Ancestor: v1alpha2.ParentReference{
+			Ancestor: v1.ParentReference{
 				Name: "ancestor",
 			},
 			Conditions: targetRefNotFoundConds,
@@ -1464,7 +1464,7 @@ func TestBuildNGFPolicyStatuses(t *testing.T) {
 		Name:       multiInvalidCondsPolicyKey.NsName.Name,
 		Conditions: invalidConds,
 		Ancestor: &graph.PolicyAncestor{
-			Ancestor: v1alpha2.ParentReference{
+			Ancestor: v1.ParentReference{
 				Name: "ancestor",
 			},
 			Conditions: targetRefNotFoundConds,