Remove TypeMeta field from PendingWorkload (kubernetes#1386)

yaroslava-serdiuk · Nov 30, 2023 · 5825d15 · 5825d15
1 parent 8431cbd
commit 5825d15
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 65 deletions.
diff --git a/apis/visibility/v1alpha1/openapi/zz_generated.openapi.go b/apis/visibility/v1alpha1/openapi/zz_generated.openapi.go
diff --git a/apis/visibility/v1alpha1/types.go b/apis/visibility/v1alpha1/types.go
@@ -20,27 +20,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// +kubebuilder:object:root=true
-
-// PendingWorkload is a user-facing representation of a pending workload that summarizes the relevant information for
-// position in the cluster queue.
-type PendingWorkload struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	// Priority indicates the workload's priority
-	Priority int32 `json:"priority"`
-
-	// LocalQueueName indicates the name of the LocalQueue the workload is submitted to
-	LocalQueueName string `json:"localQueueName"`
-
-	// PositionInClusterQueue indicates the workload's position in the ClusterQueue, starting from 0
-	PositionInClusterQueue int32 `json:"positionInClusterQueue"`
-
-	// PositionInLocalQueue indicates the workload's position in the LocalQueue, starting from 0
-	PositionInLocalQueue int32 `json:"positionInLocalQueue"`
-}
-
 // +genclient
 // +kubebuilder:object:root=true
 // +k8s:openapi-gen=true
@@ -80,6 +59,24 @@ type LocalQueueList struct {
 	Items []LocalQueue `json:"items"`
 }
 
+// PendingWorkload is a user-facing representation of a pending workload that summarizes the relevant information for
+// position in the cluster queue.
+type PendingWorkload struct {
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Priority indicates the workload's priority
+	Priority int32 `json:"priority"`
+
+	// LocalQueueName indicates the name of the LocalQueue the workload is submitted to
+	LocalQueueName string `json:"localQueueName"`
+
+	// PositionInClusterQueue indicates the workload's position in the ClusterQueue, starting from 0
+	PositionInClusterQueue int32 `json:"positionInClusterQueue"`
+
+	// PositionInLocalQueue indicates the workload's position in the LocalQueue, starting from 0
+	PositionInLocalQueue int32 `json:"positionInLocalQueue"`
+}
+
 // +k8s:openapi-gen=true
 // +kubebuilder:object:root=true
 

diff --git a/apis/visibility/v1alpha1/zz_generated.deepcopy.go b/apis/visibility/v1alpha1/zz_generated.deepcopy.go
diff --git a/client-go/applyconfiguration/visibility/v1alpha1/pendingworkload.go b/client-go/applyconfiguration/visibility/v1alpha1/pendingworkload.go