github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116309 from jiahuif-forks/feature/validating-admission-policy/skip-reconcile-unchanged-spec

Browse Source 
skip reconcile for if Spec is unchanged.
This commit is contained in:
Kubernetes Prow Robot 2023-03-06 12:58:37 -08:00 committed by GitHub
commit 5ce7038488
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
staging/src/k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy/controller_reconcile.go
View File

@ -25,6 +25,7 @@ import (
v1 "k8s.io/api/admissionregistration/v1" v1 "k8s.io/api/admissionregistration/v1"
"k8s.io/api/admissionregistration/v1alpha1" "k8s.io/api/admissionregistration/v1alpha1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
@ -179,6 +180,12 @@ func (c *policyController) reconcilePolicyDefinition(namespace, name string, def
celmetrics.Metrics.ObserveDefinition(context.TODO(), "active", "deny") celmetrics.Metrics.ObserveDefinition(context.TODO(), "active", "deny")
} }
// Skip reconcile if the spec of the definition is unchanged
if info.lastReconciledValue != nil && definition != nil &&
apiequality.Semantic.DeepEqual(info.lastReconciledValue.Spec, definition.Spec) {
return nil
}
var paramSource *v1alpha1.ParamKind var paramSource *v1alpha1.ParamKind
if definition != nil { if definition != nil {
paramSource = definition.Spec.ParamKind paramSource = definition.Spec.ParamKind
@ -365,6 +372,12 @@ func (c *policyController) reconcilePolicyBinding(namespace, name string, bindin
c.bindingInfos[nn] = info c.bindingInfos[nn] = info
} }
// Skip if the spec of the binding is unchanged.
if info.lastReconciledValue != nil && binding != nil &&
apiequality.Semantic.DeepEqual(info.lastReconciledValue.Spec, binding.Spec) {
return nil
}
var oldNamespacedDefinitionName namespacedName var oldNamespacedDefinitionName namespacedName
if info.lastReconciledValue != nil { if info.lastReconciledValue != nil {
// All validating policies are cluster-scoped so have empty namespace // All validating policies are cluster-scoped so have empty namespace