partially fix conflicts

Author: capri-xiyue

api/v1/zz_generated.deepcopy.go

@@ -62,9 +62,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",
@@ -83,9 +80,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",
@@ -104,9 +98,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",
@@ -126,9 +117,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",
@@ -145,9 +133,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",
@@ -165,9 +150,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",
@@ -186,9 +168,6 @@ func TestPodReconciler(t *testing.T) {
 			pool: &v1.InferencePool{
 				Spec: v1.InferencePoolSpec{
 					TargetPorts: []v1.Port{{Number: int32(8000)}},
-					Selector: map[v1.LabelKey]v1.LabelValue{
-						"some-key": "some-val",
-					TargetPortNumber: int32(8000),
 					Selector: v1.LabelSelector{
 						MatchLabels: map[v1.LabelKey]v1.LabelValue{
 							"some-key": "some-val",

client-go/applyconfiguration/api/v1/inferencepoolspec.go

@@ -102,9 +102,6 @@ func TestDirector_HandleRequest(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "test-pool", Namespace: "default"},
 		Spec: v1.InferencePoolSpec{
 			TargetPorts: []v1.Port{{Number: int32(8000)}},
-			Selector: map[v1.LabelKey]v1.LabelValue{
-				"app": "inference",
-			TargetPortNumber: int32(8000),
 			Selector: v1.LabelSelector{
 				MatchLabels: map[v1.LabelKey]v1.LabelValue{
 					"app": "inference",