mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-28 18:38:40 +00:00
Code Activity

refactor: factorize policy interface (#3496)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>

Co-authored-by: shuting <shuting@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-03-29 17:52:45 +02:00 • committed by GitHub
parent b4cf89e57f
commit c59affb248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/kyverno/v1/clusterpolicy_types.go
View file

@ -77,8 +77,8 @@ func (p *ClusterPolicy) BackgroundProcessingEnabled() bool {
}
// GetSpec returns the policy spec
func (p *ClusterPolicy) GetSpec() Spec {
return p.Spec
func (p *ClusterPolicy) GetSpec() *Spec {
return &p.Spec
}
// IsNamespaced indicates if the policy is namespace scoped

12
api/kyverno/v1/policy_interface.go Normal file
View file

@ -0,0 +1,12 @@
package v1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
// PolicyInterface abstracts the concrete policy type (Policy vs ClusterPolicy)
// +kubebuilder:object:generate=false
type PolicyInterface interface {
metav1.Object
GetSpec() *Spec
}

4
api/kyverno/v1/policy_types.go
View file

@ -78,8 +78,8 @@ func (p *Policy) BackgroundProcessingEnabled() bool {
}
// GetSpec returns the policy spec
func (p *Policy) GetSpec() Spec {
return p.Spec
func (p *Policy) GetSpec() *Spec {
return &p.Spec
}
// IsNamespaced indicates if the policy is namespace scoped

5
docs/crd/v1/index.html
View file

@ -1736,6 +1736,11 @@ Deprecated. Policy metrics are available via the metrics endpoint</p>
</tbody>
</table>
<hr />
<h3 id="kyverno.io/v1.PolicyInterface">PolicyInterface
</h3>
<p>
<p>PolicyInterface abstracts the concrete policy type (Policy vs ClusterPolicy)</p>
</p>
<h3 id="kyverno.io/v1.PolicyStatus">PolicyStatus
</h3>
<p>

9
pkg/autogen/autogen.go
View file

@ -243,11 +243,6 @@ func GenerateRulePatches(spec *kyverno.Spec, controllers string, log logr.Logger
return
}
type Policy interface {
GetAnnotations() map[string]string
GetSpec() kyverno.Spec
}
// podControllersKey annotation could be:
// scenario A: not exist, set default to "all", which generates on all pod controllers
// - if name / selector exist in resource description -> skip
@ -311,12 +306,12 @@ func convertRule(rule kyvernoRule, kind string) (*kyverno.Rule, error) {
return &out, nil
}
func ComputeRules(p Policy) []kyverno.Rule {
func ComputeRules(p kyverno.PolicyInterface) []kyverno.Rule {
spec := p.GetSpec()
if !toggle.AutogenInternals() {
return spec.Rules
}
applyAutoGen, desiredControllers := CanAutoGen(&spec, log.Log)
applyAutoGen, desiredControllers := CanAutoGen(spec, log.Log)
if !applyAutoGen {
desiredControllers = "none"

14
pkg/webhookconfig/configmanager.go
View file

@ -36,12 +36,6 @@ import (
var DefaultWebhookTimeout int64 = 10
// policy abstracts the concrete policy type (Policy vs ClusterPolicy)
type policy interface {
metav1.Object
GetSpec() kyverno.Spec
}
// webhookConfigManager manges the webhook configuration dynamically
// it is NOT multi-thread safe
type webhookConfigManager struct {
@ -372,7 +366,7 @@ func (m *webhookConfigManager) reconcileWebhook(namespace, name string) error {
return nil
}
func (m *webhookConfigManager) getPolicy(namespace, name string) (policy, error) {
func (m *webhookConfigManager) getPolicy(namespace, name string) (kyverno.PolicyInterface, error) {
if namespace == "" {
return m.pLister.Get(name)
} else {
@ -380,8 +374,8 @@ func (m *webhookConfigManager) getPolicy(namespace, name string) (policy, error)
}
}
func (m *webhookConfigManager) listAllPolicies() ([]policy, error) {
policies := []policy{}
func (m *webhookConfigManager) listAllPolicies() ([]kyverno.PolicyInterface, error) {
policies := []kyverno.PolicyInterface{}
polList, err := m.npLister.Policies(metav1.NamespaceAll).List(labels.Everything())
if err != nil {
return nil, errors.Wrapf(err, "failed to list Policy")
@ -734,7 +728,7 @@ func (m *webhookConfigManager) updateStatus(namespace, name string, ready bool)
}
// mergeWebhook merges the matching kinds of the policy to webhook.rule
func (m *webhookConfigManager) mergeWebhook(dst *webhook, policy policy, updateValidate bool) {
func (m *webhookConfigManager) mergeWebhook(dst *webhook, policy kyverno.PolicyInterface, updateValidate bool) {
matchedGVK := make([]string, 0)
for _, rule := range autogen.ComputeRules(policy) {
// matching kinds in generate policies need to be added to both webhook