github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128618 from knrc/error-check-fix

Browse Source 
Fix error check
This commit is contained in:
Kubernetes Prow Robot 2024-11-08 02:21:42 +00:00 committed by GitHub
commit e1e92bc403
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/mutating/dispatcher.go
View File

@ -162,6 +162,11 @@ func (d *dispatcher) dispatchInvocations(
} }
invocationKey, invocationKeyErr := keyFor(invocation) invocationKey, invocationKeyErr := keyFor(invocation)
if invocationKeyErr != nil {
// This should never happen. It occurs if there is a programming
// error causing the Param not to be a valid object.
return nil, k8serrors.NewInternalError(invocationKeyErr)
}
if reinvokeCtx.IsReinvoke() && !policyReinvokeCtx.ShouldReinvoke(invocationKey) { if reinvokeCtx.IsReinvoke() && !policyReinvokeCtx.ShouldReinvoke(invocationKey) {
continue continue
} }
@ -170,12 +175,6 @@ func (d *dispatcher) dispatchInvocations(
// Mutations for a single invocation of a MutatingAdmissionPolicy are evaluated // Mutations for a single invocation of a MutatingAdmissionPolicy are evaluated
// in order. // in order.
for mutationIndex := range invocation.Policy.Spec.Mutations { for mutationIndex := range invocation.Policy.Spec.Mutations {
if invocationKeyErr != nil {
// This should never happen. It occurs if there is a programming
// error causing the Param not to be a valid object.
return nil, k8serrors.NewInternalError(invocationKeyErr)
}
lastVersionedAttr = versionedAttr lastVersionedAttr = versionedAttr
if versionedAttr.VersionedObject == nil { // Do not call patchers if there is no object to patch. if versionedAttr.VersionedObject == nil { // Do not call patchers if there is no object to patch.
continue continue