Merge pull request #786 from Iceber/search_label_with_events

add search label to inject events annotation

Author: Iceber

pkg/generated/openapi/zz_generated.openapi.go

@@ -203,11 +203,11 @@ func (s *ResourceStorage) Get(ctx context.Context, cluster, namespace, name stri
 func (s *ResourceStorage) genListObjectsQuery(ctx context.Context, opts *internal.ListOptions) (int64, *int64, *gorm.DB, ObjectList, error) {
 	var result ObjectList
 	switch {
-	case opts.OnlyMetadata && opts.WithEvents:
+	case opts.OnlyMetadata && opts.InjectEvents:
 		result = &ResourceMetadataWithEventsList{}
 	case opts.OnlyMetadata:
 		result = &ResourceMetadataList{}
-	case opts.WithEvents:
+	case opts.InjectEvents:
 		result = &BytesWithEventsList{}
 	default:
 		result = &BytesList{}

pkg/storage/internalstorage/resource_storage.go

@@ -23,6 +23,7 @@ const (
 	SearchLabelOwnerGroupResource = "search.clusterpedia.io/owner-gr"
 	SearchLabelOwnerSeniority     = "search.clusterpedia.io/owner-seniority"
 
+	SearchLabelInjectEvents       = "search.clusterpedia.io/inject-events"
 	SearchLabelWithContinue       = "search.clusterpedia.io/with-continue"
 	SearchLabelWithRemainingCount = "search.clusterpedia.io/with-remaining-count"
 
@@ -62,7 +63,7 @@ type ListOptions struct {
 	Since  *metav1.Time
 	Before *metav1.Time
 
-	WithEvents         bool
+	InjectEvents       bool
 	WithContinue       *bool
 	WithRemainingCount *bool
 

staging/src/github.com/clusterpedia-io/api/clusterpedia/types.go

@@ -68,6 +68,7 @@ func Convert_v1beta1_ListOptions_To_clusterpedia_ListOptions(in *ListOptions, ou
 		return err
 	}
 
+	out.InjectEvents = in.InjectEvents
 	out.WithContinue = in.WithContinue
 	out.WithRemainingCount = in.WithRemainingCount
 
@@ -150,6 +151,10 @@ func Convert_v1beta1_ListOptions_To_clusterpedia_ListOptions(in *ListOptions, ou
 							return fmt.Errorf("Invalid Query Offset(%s): %w", out.Continue, err)
 						}
 					}
+				case clusterpedia.SearchLabelInjectEvents:
+					if err := runtime.Convert_Slice_string_To_bool(&values, &out.InjectEvents, s); err != nil {
+						return err
+					}
 				case clusterpedia.SearchLabelWithContinue:
 					if in.WithContinue == nil && len(values) != 0 {
 						if err := runtime.Convert_Slice_string_To_Pointer_bool(&values, &out.WithContinue, s); err != nil {
@@ -226,6 +231,7 @@ func Convert_clusterpedia_ListOptions_To_v1beta1_ListOptions(in *clusterpedia.Li
 		return err
 	}
 
+	out.InjectEvents = in.InjectEvents
 	out.WithContinue = in.WithContinue
 	out.WithRemainingCount = in.WithRemainingCount
 	return nil

staging/src/github.com/clusterpedia-io/api/clusterpedia/v1beta1/conversion.go

@@ -44,6 +44,9 @@ type ListOptions struct {
 	// +optional
 	OwnerSeniority int `json:"ownerSeniority,omitempty"`
 
+	// +optional
+	InjectEvents bool `json:"injectEvents,omitempty"`
+
 	// +optional
 	WithContinue *bool `json:"withContinue,omitempty"`