From 1d631f7eef4db32afe23460843c4084ed3a3f6bd Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Tue, 6 Sep 2022 17:13:44 +0800 Subject: [PATCH] go1.19: change some atomic.Value to atomic.Bool Signed-off-by: Abirdcfly --- .../admission/configuration/mutating_webhook_manager.go | 8 ++++---- .../admission/configuration/validating_webhook_manager.go | 8 ++++---- .../k8s.io/apiserver/pkg/quota/v1/generic/evaluator.go | 4 ++-- .../src/k8s.io/apiserver/pkg/storageversion/manager.go | 4 ++-- staging/src/k8s.io/component-base/metrics/registry.go | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/configuration/mutating_webhook_manager.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/mutating_webhook_manager.go index ae57e6739a2..ea58e6c3267 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/configuration/mutating_webhook_manager.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/configuration/mutating_webhook_manager.go @@ -36,11 +36,11 @@ type mutatingWebhookConfigurationManager struct { configuration *atomic.Value lister admissionregistrationlisters.MutatingWebhookConfigurationLister hasSynced func() bool - // initialConfigurationSynced stores a boolean value, which tracks if + // initialConfigurationSynced tracks if // the existing webhook configs have been synced (honored) by the // manager at startup-- the informer has synced and either has no items // or has finished executing updateConfiguration() once. - initialConfigurationSynced *atomic.Value + initialConfigurationSynced *atomic.Bool } var _ generic.Source = &mutatingWebhookConfigurationManager{} @@ -51,7 +51,7 @@ func NewMutatingWebhookConfigurationManager(f informers.SharedInformerFactory) g configuration: &atomic.Value{}, lister: informer.Lister(), hasSynced: informer.Informer().HasSynced, - initialConfigurationSynced: &atomic.Value{}, + initialConfigurationSynced: &atomic.Bool{}, } // Start with an empty list @@ -80,7 +80,7 @@ func (m *mutatingWebhookConfigurationManager) HasSynced() bool { if !m.hasSynced() { return false } - if m.initialConfigurationSynced.Load().(bool) { + if m.initialConfigurationSynced.Load() { // the informer has synced and configuration has been updated return true } diff --git a/staging/src/k8s.io/apiserver/pkg/admission/configuration/validating_webhook_manager.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/validating_webhook_manager.go index b8c1904ea8a..00f954251f4 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/configuration/validating_webhook_manager.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/configuration/validating_webhook_manager.go @@ -36,11 +36,11 @@ type validatingWebhookConfigurationManager struct { configuration *atomic.Value lister admissionregistrationlisters.ValidatingWebhookConfigurationLister hasSynced func() bool - // initialConfigurationSynced stores a boolean value, which tracks if + // initialConfigurationSynced tracks if // the existing webhook configs have been synced (honored) by the // manager at startup-- the informer has synced and either has no items // or has finished executing updateConfiguration() once. - initialConfigurationSynced *atomic.Value + initialConfigurationSynced *atomic.Bool } var _ generic.Source = &validatingWebhookConfigurationManager{} @@ -51,7 +51,7 @@ func NewValidatingWebhookConfigurationManager(f informers.SharedInformerFactory) configuration: &atomic.Value{}, lister: informer.Lister(), hasSynced: informer.Informer().HasSynced, - initialConfigurationSynced: &atomic.Value{}, + initialConfigurationSynced: &atomic.Bool{}, } // Start with an empty list @@ -80,7 +80,7 @@ func (v *validatingWebhookConfigurationManager) HasSynced() bool { if !v.hasSynced() { return false } - if v.initialConfigurationSynced.Load().(bool) { + if v.initialConfigurationSynced.Load() { // the informer has synced and configuration has been updated return true } diff --git a/staging/src/k8s.io/apiserver/pkg/quota/v1/generic/evaluator.go b/staging/src/k8s.io/apiserver/pkg/quota/v1/generic/evaluator.go index 805f8159d60..55b31a745a0 100644 --- a/staging/src/k8s.io/apiserver/pkg/quota/v1/generic/evaluator.go +++ b/staging/src/k8s.io/apiserver/pkg/quota/v1/generic/evaluator.go @@ -52,10 +52,10 @@ func ListerFuncForResourceFunc(f InformerForResourceFunc) quota.ListerForResourc // cachedHasSynced returns a function that calls hasSynced() until it returns true once, then returns true func cachedHasSynced(hasSynced func() bool) func() bool { - cache := &atomic.Value{} + cache := &atomic.Bool{} cache.Store(false) return func() bool { - if cache.Load().(bool) { + if cache.Load() { // short-circuit if already synced return true } diff --git a/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go b/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go index c5ec9da1dd8..0e0d9542b0f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go +++ b/staging/src/k8s.io/apiserver/pkg/storageversion/manager.go @@ -64,7 +64,7 @@ var _ Manager = &defaultManager{} // defaultManager indicates if an apiserver has completed reporting its storage versions. type defaultManager struct { - completed atomic.Value + completed atomic.Bool mu sync.RWMutex // managedResourceInfos records the ResourceInfos whose StorageVersions will get updated in the next @@ -268,7 +268,7 @@ func (s *defaultManager) setComplete() { // Completed returns if updating StorageVersions has completed. func (s *defaultManager) Completed() bool { - return s.completed.Load().(bool) + return s.completed.Load() } func decodableVersions(directlyDecodableVersions []schema.GroupVersion, e runtime.EquivalentResourceRegistry, gr schema.GroupResource) []string { diff --git a/staging/src/k8s.io/component-base/metrics/registry.go b/staging/src/k8s.io/component-base/metrics/registry.go index 6c97bb504ff..5d744397eee 100644 --- a/staging/src/k8s.io/component-base/metrics/registry.go +++ b/staging/src/k8s.io/component-base/metrics/registry.go @@ -32,7 +32,7 @@ import ( var ( showHiddenOnce sync.Once disabledMetricsLock sync.RWMutex - showHidden atomic.Value + showHidden atomic.Bool registries []*kubeRegistry // stores all registries created by NewKubeRegistry() registriesLock sync.RWMutex disabledMetrics = map[string]struct{}{} @@ -87,7 +87,7 @@ func SetShowHidden() { // is enabled. While the primary usecase for this is internal (to determine // registration behavior) this can also be used to introspect func ShouldShowHidden() bool { - return showHidden.Load() != nil && showHidden.Load().(bool) + return showHidden.Load() } // Registerable is an interface for a collector metric which we