diff --git a/go.mod b/go.mod index a8ecfe7d3..a3015a4ec 100644 --- a/go.mod +++ b/go.mod @@ -42,9 +42,9 @@ require ( google.golang.org/protobuf v1.28.1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api v0.0.0-20230310084041-7785f7653f92 - k8s.io/apimachinery v0.0.0-20230310083533-ca95f42b2383 - k8s.io/client-go v0.0.0-20230310084519-d2ebc4d27c5a + k8s.io/api v0.0.0-20230310084044-182afbd21219 + k8s.io/apimachinery v0.0.0-20230310083535-8fccf3d61224 + k8s.io/client-go v0.0.0-20230310170147-1f020beddb3d k8s.io/component-base v0.0.0-20230310085212-d69652187fff k8s.io/klog/v2 v2.90.1 k8s.io/kms v0.0.0-20230304001132-5439f76ca4a7 @@ -124,9 +124,9 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230310084041-7785f7653f92 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230310083533-ca95f42b2383 - k8s.io/client-go => k8s.io/client-go v0.0.0-20230310084519-d2ebc4d27c5a + k8s.io/api => k8s.io/api v0.0.0-20230310084044-182afbd21219 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230310083535-8fccf3d61224 + k8s.io/client-go => k8s.io/client-go v0.0.0-20230310170147-1f020beddb3d k8s.io/component-base => k8s.io/component-base v0.0.0-20230310085212-d69652187fff k8s.io/kms => k8s.io/kms v0.0.0-20230304001132-5439f76ca4a7 ) diff --git a/go.sum b/go.sum index 48257b757..1bde48b52 100644 --- a/go.sum +++ b/go.sum @@ -874,12 +874,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20230310084041-7785f7653f92 h1:Bcf6XSNDjTLbkKqalEH4WESD5jGuuMg56WfZBxye6Oc= -k8s.io/api v0.0.0-20230310084041-7785f7653f92/go.mod h1:54YtNzxdtIDMfqQTVaBmptCRgtrUw9mSUMvt9sCX3fI= -k8s.io/apimachinery v0.0.0-20230310083533-ca95f42b2383 h1:hc7CTuFg8uUBL3NHB1LPOj6xlSyy52zvy4rwyPtrils= -k8s.io/apimachinery v0.0.0-20230310083533-ca95f42b2383/go.mod h1:RWA+8iKvi6iwtPZ0MMwtZSlZRiH+SnmQH2SbXJrVDPQ= -k8s.io/client-go v0.0.0-20230310084519-d2ebc4d27c5a h1:YPm/O39dwIK1TccLAPI4kqp5cgyR5069FnrUeTDfcEM= -k8s.io/client-go v0.0.0-20230310084519-d2ebc4d27c5a/go.mod h1:RYmoEfRTbcCyQuxzOrnKnLil0oReXeKAYKHP6h5V6oM= +k8s.io/api v0.0.0-20230310084044-182afbd21219 h1:Zi16ywjzp2CqeHJZoz3N0RlFu20NqeuIzqY1RkRg4FU= +k8s.io/api v0.0.0-20230310084044-182afbd21219/go.mod h1:BufeAXF75avqFSWCYqXkvwYrwI4ZAem3uLWUZFS14hw= +k8s.io/apimachinery v0.0.0-20230310083535-8fccf3d61224 h1:LhE0BNPRZYIEMmTBywXwvw3P3YtfPIo3xRefHYrbR0s= +k8s.io/apimachinery v0.0.0-20230310083535-8fccf3d61224/go.mod h1:RWA+8iKvi6iwtPZ0MMwtZSlZRiH+SnmQH2SbXJrVDPQ= +k8s.io/client-go v0.0.0-20230310170147-1f020beddb3d h1:tN+1E7LiQEThyKqjEj+EATTSDsHML4SfriNQeRN5neA= +k8s.io/client-go v0.0.0-20230310170147-1f020beddb3d/go.mod h1:seT1S8LUx48CIppmquME8d52oZQTiI2CX577lxB8cXA= k8s.io/component-base v0.0.0-20230310085212-d69652187fff h1:xIjiK+aBPzY5Mqh/lFvmlfgvS1O35/hyhPw/LTmYyNA= k8s.io/component-base v0.0.0-20230310085212-d69652187fff/go.mod h1:Z2LoX89dLUu0xNvMSY057kEMNJjD/XD53nEyD0Lji2s= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= diff --git a/pkg/storage/cacher/cacher.go b/pkg/storage/cacher/cacher.go index 3948129c5..8620c9fcb 100644 --- a/pkg/storage/cacher/cacher.go +++ b/pkg/storage/cacher/cacher.go @@ -415,6 +415,9 @@ func NewCacherFromConfig(config Config) (*Cacher, error) { // We don't want to terminate all watchers as recreating all watchers puts high load on api-server. // In most of the cases, leader is reelected within few cycles. reflector.MaxInternalErrorRetryDuration = time.Second * 30 + // since the watch-list is provided by the watch cache instruct + // the reflector to issue a regular LIST against the store + reflector.UseWatchList = false cacher.watchCache = watchCache cacher.reflector = reflector