mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-13 19:28:55 +00:00
Code Activity

improve logging (#5941)

Browse source 
Signed-off-by: ShutingZhao <shuting@nirmata.com>

Signed-off-by: ShutingZhao <shuting@nirmata.com>
This commit is contained in:
shuting 2023-01-10 00:45:53 +08:00 • committed by GitHub
parent 6ce8e16884
commit e323e693b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/config/config.go
View file

@ -273,7 +273,7 @@ func (cd *configuration) load(cm *corev1.ConfigMap) {
cd.filters = parseKinds(cm.Data["resourceFilters"])
newDefaultRegistry, ok := cm.Data["defaultRegistry"]
if !ok {
logger.V(4).Info("configuration: No defaultRegistry defined in ConfigMap")
logger.V(6).Info("configuration: No defaultRegistry defined in ConfigMap")
} else {
if valid.IsDNSName(newDefaultRegistry) {
logger.V(4).Info("Updated defaultRegistry config parameter.", "oldDefaultRegistry", cd.defaultRegistry, "newDefaultRegistry", newDefaultRegistry)
@ -284,7 +284,7 @@ func (cd *configuration) load(cm *corev1.ConfigMap) {
}
enableDefaultRegistryMutation, ok := cm.Data["enableDefaultRegistryMutation"]
if !ok {
logger.V(4).Info("configuration: No enableDefaultRegistryMutation defined in ConfigMap")
logger.V(6).Info("configuration: No enableDefaultRegistryMutation defined in ConfigMap")
} else {
newEnableDefaultRegistryMutation, err := strconv.ParseBool(enableDefaultRegistryMutation)
if err != nil {

13
pkg/controllers/report/background/controller.go
View file

@ -121,6 +121,7 @@ func NewController(
}
func (c *controller) Run(ctx context.Context, workers int) {
logger.Info("background scan", "interval", c.forceDelay.Abs().String())
controllerutils.Run(ctx, logger, ControllerName, time.Second, c.queue, workers, maxRetries, c.reconcile)
}
@ -145,7 +146,7 @@ func (c *controller) enqueueResources() {
}
// TODO: utils
func (c *controller) fetchClusterPolicies(logger logr.Logger) ([]kyvernov1.PolicyInterface, error) {
func (c *controller) fetchClusterPolicies() ([]kyvernov1.PolicyInterface, error) {
var policies []kyvernov1.PolicyInterface
if cpols, err := c.cpolLister.List(labels.Everything()); err != nil {
return nil, err
@ -158,7 +159,7 @@ func (c *controller) fetchClusterPolicies(logger logr.Logger) ([]kyvernov1.Polic
}
// TODO: utils
func (c *controller) fetchPolicies(logger logr.Logger, namespace string) ([]kyvernov1.PolicyInterface, error) {
func (c *controller) fetchPolicies(namespace string) ([]kyvernov1.PolicyInterface, error) {
var policies []kyvernov1.PolicyInterface
if pols, err := c.polLister.Policies(namespace).List(labels.Everything()); err != nil {
return nil, err
@ -352,7 +353,7 @@ func (c *controller) reconcileReport(
}
}
func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, namespace, name string) error {
func (c *controller) reconcile(ctx context.Context, log logr.Logger, key, namespace, name string) error {
// try to find resource from the cache
uid := types.UID(name)
resource, gvk, exists := c.metadataCache.GetResourceHash(uid)
@ -374,19 +375,19 @@ func (c *controller) reconcile(ctx context.Context, logger logr.Logger, key, nam
}
}
// load all policies
policies, err := c.fetchClusterPolicies(logger)
policies, err := c.fetchClusterPolicies()
if err != nil {
return err
}
if namespace != "" {
pols, err := c.fetchPolicies(logger, namespace)
pols, err := c.fetchPolicies(namespace)
if err != nil {
return err
}
policies = append(policies, pols...)
}
// load background policies
backgroundPolicies := utils.RemoveNonBackgroundPolicies(logger, policies...)
backgroundPolicies := utils.RemoveNonBackgroundPolicies(policies...)
if err != nil {
return err
}

6
pkg/controllers/report/resource/controller.go
View file

@ -216,11 +216,11 @@ func (c *controller) updateDynamicWatchers(ctx context.Context) error {
if err != nil {
return err
}
policies, err := c.fetchPolicies(logger, metav1.NamespaceAll)
policies, err := c.fetchPolicies(metav1.NamespaceAll)
if err != nil {
return err
}
kinds := utils.BuildKindSet(logger, utils.RemoveNonValidationPolicies(logger, append(clusterPolicies, policies...)...)...)
kinds := utils.BuildKindSet(logger, utils.RemoveNonValidationPolicies(append(clusterPolicies, policies...)...)...)
gvrs := map[schema.GroupVersionKind]schema.GroupVersionResource{}
for _, kind := range sets.List(kinds) {
apiVersion, kind := kubeutils.GetKindFromGVK(kind)
@ -325,7 +325,7 @@ func (c *controller) fetchClusterPolicies(logger logr.Logger) ([]kyvernov1.Polic
return policies, nil
}
func (c *controller) fetchPolicies(logger logr.Logger, namespace string) ([]kyvernov1.PolicyInterface, error) {
func (c *controller) fetchPolicies(namespace string) ([]kyvernov1.PolicyInterface, error) {
var policies []kyvernov1.PolicyInterface
if pols, err := c.polLister.Policies(namespace).List(labels.Everything()); err != nil {
return nil, err

8
pkg/controllers/report/utils/utils.go
View file

@ -12,7 +12,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
)
func CanBackgroundProcess(logger logr.Logger, p kyvernov1.PolicyInterface) bool {
func CanBackgroundProcess(p kyvernov1.PolicyInterface) bool {
if !p.BackgroundProcessingEnabled() {
return false
}
@ -34,17 +34,17 @@ func BuildKindSet(logger logr.Logger, policies ...kyvernov1.PolicyInterface) set
return kinds
}
func RemoveNonBackgroundPolicies(logger logr.Logger, policies ...kyvernov1.PolicyInterface) []kyvernov1.PolicyInterface {
func RemoveNonBackgroundPolicies(policies ...kyvernov1.PolicyInterface) []kyvernov1.PolicyInterface {
var backgroundPolicies []kyvernov1.PolicyInterface
for _, pol := range policies {
if CanBackgroundProcess(logger, pol) {
if CanBackgroundProcess(pol) {
backgroundPolicies = append(backgroundPolicies, pol)
}
}
return backgroundPolicies
}
func RemoveNonValidationPolicies(logger logr.Logger, policies ...kyvernov1.PolicyInterface) []kyvernov1.PolicyInterface {
func RemoveNonValidationPolicies(policies ...kyvernov1.PolicyInterface) []kyvernov1.PolicyInterface {
var validationPolicies []kyvernov1.PolicyInterface
for _, pol := range policies {
spec := pol.GetSpec()