mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

fix: use default retry with retryfunc for a conflict (#4973)

Browse source 
DefaultRetry is the recommended retry for a conflict
where multiple clients are making changes to the same resource

Signed-off-by: prateekpandey14 <prateek.pandey@nirmata.com>

Signed-off-by: prateekpandey14 <prateek.pandey@nirmata.com>
Co-authored-by: shuting <shuting@nirmata.com>
This commit is contained in:
Prateek Pandey 2022-10-17 13:48:52 +05:30 • committed by GitHub
parent b522274d74
commit 2bd6c62b55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/background/common/util.go
View file

@ -2,7 +2,6 @@ package common
import (
"context"
"time"
kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
@ -11,20 +10,12 @@ import (
"github.com/kyverno/kyverno/pkg/config"
"github.com/kyverno/kyverno/pkg/logging"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
)
var DefaultRetry = wait.Backoff{
Steps: 15,
Duration: 100 * time.Millisecond,
Factor: 1.0,
Jitter: 0.1,
}
func Update(client versioned.Interface, urLister kyvernov1beta1listers.UpdateRequestNamespaceLister, name string, mutator func(*kyvernov1beta1.UpdateRequest)) (*kyvernov1beta1.UpdateRequest, error) {
var ur *kyvernov1beta1.UpdateRequest
err := retry.RetryOnConflict(DefaultRetry, func() error {
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
ur, err := urLister.Get(name)
if err != nil {
logging.Error(err, "[ATTEMPT] failed to fetch update request", "name", name)
@ -48,7 +39,7 @@ func Update(client versioned.Interface, urLister kyvernov1beta1listers.UpdateReq
func UpdateStatus(client versioned.Interface, urLister kyvernov1beta1listers.UpdateRequestNamespaceLister, name string, state kyvernov1beta1.UpdateRequestState, message string, genResources []kyvernov1.ResourceSpec) (*kyvernov1beta1.UpdateRequest, error) {
var ur *kyvernov1beta1.UpdateRequest
err := retry.RetryOnConflict(DefaultRetry, func() error {
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
ur, err := urLister.Get(name)
if err != nil {
logging.Error(err, "[ATTEMPT] failed to fetch update request", "name", name)

4
pkg/background/update_request_controller.go
View file

@ -373,7 +373,7 @@ func (c *controller) processUR(ur *kyvernov1beta1.UpdateRequest) error {
func (c *controller) acquireUR(ur *kyvernov1beta1.UpdateRequest) (*kyvernov1beta1.UpdateRequest, bool, error) {
name := ur.GetName()
err := retry.RetryOnConflict(common.DefaultRetry, func() error {
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
var err error
ur, err = c.urLister.Get(name)
if err != nil {
@ -395,7 +395,7 @@ func (c *controller) acquireUR(ur *kyvernov1beta1.UpdateRequest) (*kyvernov1beta
}
func (c *controller) releaseUR(ur *kyvernov1beta1.UpdateRequest) (*kyvernov1beta1.UpdateRequest, error) {
err := retry.RetryOnConflict(common.DefaultRetry, func() error {
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
var err error
ur, err = c.urLister.Get(ur.GetName())
if err != nil {