public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow to watch from the dual writer (#91375)

Browse Source 
* Allow to watch from the dual writer

* Remove comments

* Lint
This commit is contained in:
Leonor Oliveira
2024-08-01 15:09:51 +02:00
committed by GitHub
parent a32854549c
commit fb9903ed7c
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apiserver/rest/dualwriter_mode3.go
+9 -8
View File
@@ -8,13 +8,15 @@ import (
metainternalversion "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"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/klog/v2"
)
type DualWriterMode3 struct {
Legacy LegacyStorage
Storage Storage
Legacy LegacyStorage
Storage Storage
watchImp rest.Watcher // watch is only available in mode 3 and 4
*dualWriterMetrics
kind string
Log klog.Logger
@@ -170,12 +172,11 @@ func (d *DualWriterMode3) DeleteCollection(ctx context.Context, deleteValidation
return res, err
}
//TODO: uncomment when storage watch is implemented
// func (d *DualWriterMode3) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
// var method = "watch"
// d.Log.WithValues("kind", d.kind, "method", method, "mode", mode3Str).Info("starting to watch")
// return d.Storage.Watch(ctx, options)
// }
func (d *DualWriterMode3) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
var method = "watch"
d.Log.WithValues("method", method, "mode", mode3Str).Info("starting to watch")
return d.watchImp.Watch(ctx, options)
}
func (d *DualWriterMode3) Destroy() {
d.Storage.Destroy()
pkg/apiserver/rest/dualwriter_mode4.go
+9 -8
View File
@@ -7,13 +7,15 @@ import (
metainternalversion "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"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/klog/v2"
)
type DualWriterMode4 struct {
Legacy LegacyStorage
Storage Storage
Legacy LegacyStorage
Storage Storage
watchImp rest.Watcher // watch is only available in mode 3 and 4
*dualWriterMetrics
kind string
Log klog.Logger
@@ -122,12 +124,11 @@ func (d *DualWriterMode4) List(ctx context.Context, options *metainternalversion
return res, err
}
//TODO: uncomment when storage watch is implemented
// func (d *DualWriterMode4) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
// var method = "watch"
// d.Log.WithValues("kind", d.kind, "method", method, "mode", mode4Str).Info("starting to watch")
// return d.Storage.Watch(ctx, options)
// }
func (d *DualWriterMode4) Watch(ctx context.Context, options *metainternalversion.ListOptions) (watch.Interface, error) {
var method = "watch"
d.Log.WithValues("method", method, "mode", mode4Str).Info("starting to watch")
return d.watchImp.Watch(ctx, options)
}
func (d *DualWriterMode4) Destroy() {
d.Storage.Destroy()