fix(platform): watch cluster/clustercredential/application with options

tkestack · Aug 22, 2023 · aafde18 · aafde18
1 parent 4cd32bb
commit aafde18
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/pkg/application/registry/application/storage/storage.go b/pkg/application/registry/application/storage/storage.go
@@ -28,6 +28,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/generic/registry"
 	"k8s.io/apiserver/pkg/registry/rest"
@@ -119,6 +120,12 @@ func (r *GenericREST) ShortNames() []string {
 	return []string{"app"}
 }
 
+// Watch selects resources in the storage which match to the selector. 'options' can be nil.
+func (r *GenericREST) Watch(ctx context.Context, options *metainternal.ListOptions) (watch.Interface, error) {
+	wrappedOptions := apiserverutil.PredicateListOptions(ctx, options)
+	return r.Store.Watch(ctx, wrappedOptions)
+}
+
 // List selects resources in the storage which match to the selector. 'options' can be nil.
 func (r *GenericREST) List(ctx context.Context, options *metainternal.ListOptions) (runtime.Object, error) {
 	wrappedOptions := apiserverutil.PredicateListOptions(ctx, options)

diff --git a/pkg/platform/registry/cluster/storage/storage.go b/pkg/platform/registry/cluster/storage/storage.go
@@ -26,6 +26,7 @@ import (
 	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/generic/registry"
 	"k8s.io/apiserver/pkg/registry/rest"
@@ -163,6 +164,12 @@ func (r *REST) ShortNames() []string {
 	return []string{"cls"}
 }
 
+// Watch selects resources in the storage which match to the selector. 'options' can be nil.
+func (r *REST) Watch(ctx context.Context, options *metainternal.ListOptions) (watch.Interface, error) {
+	wrappedOptions := apiserverutil.PredicateListOptions(ctx, options)
+	return r.Store.Watch(ctx, wrappedOptions)
+}
+
 // List selects resources in the storage which match to the selector. 'options' can be nil.
 func (r *REST) List(ctx context.Context, options *metainternal.ListOptions) (runtime.Object, error) {
 	wrappedOptions := apiserverutil.PredicateListOptions(ctx, options)

diff --git a/pkg/platform/registry/clustercredential/storage/storage.go b/pkg/platform/registry/clustercredential/storage/storage.go
@@ -25,6 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/generic/registry"
 	"k8s.io/apiserver/pkg/registry/rest"
@@ -96,6 +97,22 @@ func (r *REST) ShortNames() []string {
 	return []string{"cc"}
 }
 
+// Watch selects resources in the storage which match to the selector. 'options' can be nil.
+func (r *REST) Watch(ctx context.Context, options *metainternal.ListOptions) (watch.Interface, error) {
+	_, tenantID := authentication.UsernameAndTenantID(ctx)
+	if tenantID != "" {
+		if options == nil {
+			options = &metainternal.ListOptions{}
+		}
+		if options.FieldSelector == nil {
+			options.FieldSelector = fields.OneTermEqualSelector("tenantID", tenantID)
+		} else {
+			options.FieldSelector = fields.AndSelectors(options.FieldSelector, fields.OneTermEqualSelector("tenantID", tenantID))
+		}
+	}
+	return r.Store.Watch(ctx, options)
+}
+
 // List selects resources in the storage which match to the selector. 'options' can be nil.
 func (r *REST) List(ctx context.Context, options *metainternal.ListOptions) (runtime.Object, error) {
 	_, tenantID := authentication.UsernameAndTenantID(ctx)