github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

DRA: notify ResourceClaim or ResourceClass of wrong params

Browse Source
This commit is contained in:
Alexey Fomenko 2023-10-09 10:44:59 +03:00
parent cdc026fad1
commit 465d3bb65b
No known key found for this signature in database
GPG Key ID: 6E69CDBE939C35EE
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
staging/src/k8s.io/dynamic-resource-allocation/controller/controller.go
View File

@ -348,7 +348,6 @@ func (ctrl *controller) Run(workers int) {
var errRequeue = errors.New("requeue") var errRequeue = errors.New("requeue")
// errPeriodic is a special error instance that functions can return // errPeriodic is a special error instance that functions can return
// to request silent instance that functions can return
// to request silent retrying at a fixed rate. // to request silent retrying at a fixed rate.
var errPeriodic = errors.New("periodic") var errPeriodic = errors.New("periodic")
@ -527,8 +526,9 @@ func (ctrl *controller) syncClaim(ctx context.Context, claim *resourcev1alpha2.R
return errRequeue return errRequeue
} }
// Check parameters. // Check parameters. Do not record event to Claim if its parameters are invalid,
claimParameters, classParameters, err := ctrl.getParameters(ctx, claim, class) // syncKey will record the error.
claimParameters, classParameters, err := ctrl.getParameters(ctx, claim, class, false)
if err != nil { if err != nil {
return err return err
} }
@ -549,14 +549,18 @@ func (ctrl *controller) syncClaim(ctx context.Context, claim *resourcev1alpha2.R
return nil return nil
} }
func (ctrl *controller) getParameters(ctx context.Context, claim *resourcev1alpha2.ResourceClaim, class *resourcev1alpha2.ResourceClass) (claimParameters, classParameters interface{}, err error) { func (ctrl *controller) getParameters(ctx context.Context, claim *resourcev1alpha2.ResourceClaim, class *resourcev1alpha2.ResourceClass, notifyClaim bool) (claimParameters, classParameters interface{}, err error) {
classParameters, err = ctrl.driver.GetClassParameters(ctx, class) classParameters, err = ctrl.driver.GetClassParameters(ctx, class)
if err != nil { if err != nil {
ctrl.eventRecorder.Event(class, v1.EventTypeWarning, "Failed", err.Error())
err = fmt.Errorf("class parameters %s: %v", class.ParametersRef, err) err = fmt.Errorf("class parameters %s: %v", class.ParametersRef, err)
return return
} }
claimParameters, err = ctrl.driver.GetClaimParameters(ctx, claim, class, classParameters) claimParameters, err = ctrl.driver.GetClaimParameters(ctx, claim, class, classParameters)
if err != nil { if err != nil {
if notifyClaim {
ctrl.eventRecorder.Event(claim, v1.EventTypeWarning, "Failed", err.Error())
}
err = fmt.Errorf("claim parameters %s: %v", claim.Spec.ParametersRef, err) err = fmt.Errorf("claim parameters %s: %v", claim.Spec.ParametersRef, err)
return return
} }
@ -674,9 +678,10 @@ func (ctrl *controller) checkPodClaim(ctx context.Context, pod *v1.Pod, podClaim
if class.DriverName != ctrl.name { if class.DriverName != ctrl.name {
return nil, nil return nil, nil
} }
// Check parameters. // Check parameters. Record event to claim and pod if parameters are invalid.
claimParameters, classParameters, err := ctrl.getParameters(ctx, claim, class) claimParameters, classParameters, err := ctrl.getParameters(ctx, claim, class, true)
if err != nil { if err != nil {
ctrl.eventRecorder.Event(pod, v1.EventTypeWarning, "Failed", fmt.Sprintf("claim %v: %v", claim.Name, err.Error()))
return nil, err return nil, err
} }
return &ClaimAllocation{ return &ClaimAllocation{