Improve e2e tests

apis/visibility/v1alpha1/conversion_test.go

@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/diff"
 

apis/visibility/v1alpha1/types.go

@@ -14,17 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/*
-This file is needed for kubernetes/code-generator/kube_codegen.sh script used in hack/update-codegen.sh.
-*/
-
 package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// +genclient
 // +kubebuilder:object:root=true
 
 // PendingWorkload is a user-facing representation of a pending workload that summarizes the relevant information for
@@ -34,20 +29,45 @@ type PendingWorkload struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 }
 
+// +genclient
 // +kubebuilder:object:root=true
 // +k8s:openapi-gen=true
+// +genclient:nonNamespaced
+// +genclient:method=GetPendingWorkloadsSummary,verb=get,subresource=pendingworkloads,result=sigs.k8s.io/kueue/apis/visibility/v1alpha1.PendingWorkloadsSummary
+type ClusterQueue struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-// PendingWorkloadSummary contains a list of pending workloads in the context
-// of the query (within LocalQueue or ClusterQueue).
-type PendingWorkloadSummary struct {
+	Summary PendingWorkloadsSummary `json:"pendingworkloadsummary"`
+}
+
+// +kubebuilder:object:root=true
+type ClusterQueueList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
+	Items []ClusterQueue `json:"items"`
+}
+
+// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
+
+// PendingWorkloadsSummary contains a list of pending workloads in the context
+// of the query (within LocalQueue or ClusterQueue).
+type PendingWorkloadsSummary struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
 	Items []PendingWorkload `json:"items"`
 }
 
 // +kubebuilder:object:root=true
-type PendingWorkloadList PendingWorkloadSummary
+type PendingWorkloadsSummaryList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []PendingWorkloadsSummary `json:"items"`
+}
 
 // +kubebuilder:object:root=true
 // +k8s:openapi-gen=true
@@ -67,7 +87,7 @@ type PendingWorkloadOptions struct {
 
 func init() {
 	SchemeBuilder.Register(
-		&PendingWorkloadSummary{},
+		&PendingWorkloadsSummary{},
 		&PendingWorkloadOptions{},
 	)
 }