mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-05 15:37:19 +00:00
Code Activity

fix deployment replica type conversion and refactor webhook logs (#3022)

Browse source 
- add level in info webhook configuration update success logs
- fix deployment replica count conversion issue

Signed-off-by: prateekpandey14 <prateekpandey14@gmail.com>
This commit is contained in:
Prateek Pandey 2022-01-19 22:44:33 +05:30 • committed by GitHub
parent ad56087b91
commit c30dfe70a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/tls/certRenewer.go
View file

@ -408,12 +408,12 @@ func (c *CertRenewer) ValidCert() (bool, error) {
// IsKyvernoInRollingUpdate returns true if Kyverno is in rolling update // IsKyvernoInRollingUpdate returns true if Kyverno is in rolling update
func IsKyvernoInRollingUpdate(deploy map[string]interface{}, logger logr.Logger) bool { func IsKyvernoInRollingUpdate(deploy map[string]interface{}, logger logr.Logger) bool {
replicas, _, err := unstructured.NestedInt64(deploy, "spec", "replicas") replicas, _, err := unstructured.NestedFloat64(deploy, "spec", "replicas")
if err != nil { if err != nil {
logger.Error(err, "unable to fetch spec.replicas") logger.Error(err, "unable to fetch spec.replicas")
} }
nonTerminatedReplicas, _, err := unstructured.NestedInt64(deploy, "status", "replicas") nonTerminatedReplicas, _, err := unstructured.NestedFloat64(deploy, "status", "replicas")
if err != nil { if err != nil {
logger.Error(err, "unable to fetch status.replicas") logger.Error(err, "unable to fetch status.replicas")
} }

6
pkg/webhookconfig/registration.go
View file

@ -217,7 +217,7 @@ func (wrc *Register) UpdateWebhookConfigurations(configHandler config.Interface)
logger := wrc.log.WithName("UpdateWebhookConfigurations") logger := wrc.log.WithName("UpdateWebhookConfigurations")
for { for {
<-wrc.UpdateWebhookChan <-wrc.UpdateWebhookChan
logger.Info("received the signal to update webhook configurations") logger.V(4).Info("received the signal to update webhook configurations")
var nsSelector map[string]interface{} var nsSelector map[string]interface{}
webhookCfgs := configHandler.GetWebhooks() webhookCfgs := configHandler.GetWebhooks()
@ -239,14 +239,14 @@ func (wrc *Register) UpdateWebhookConfigurations(configHandler config.Interface)
logger.Error(err, "unable to update mutatingWebhookConfigurations", "name", getResourceMutatingWebhookConfigName(wrc.serverIP)) logger.Error(err, "unable to update mutatingWebhookConfigurations", "name", getResourceMutatingWebhookConfigName(wrc.serverIP))
go func() { wrc.UpdateWebhookChan <- true }() go func() { wrc.UpdateWebhookChan <- true }()
} else { } else {
logger.Info("successfully updated mutatingWebhookConfigurations", "name", getResourceMutatingWebhookConfigName(wrc.serverIP)) logger.V(4).Info("successfully updated mutatingWebhookConfigurations", "name", getResourceMutatingWebhookConfigName(wrc.serverIP))
} }
if err := wrc.updateResourceValidatingWebhookConfiguration(nsSelector); err != nil { if err := wrc.updateResourceValidatingWebhookConfiguration(nsSelector); err != nil {
logger.Error(err, "unable to update validatingWebhookConfigurations", "name", getResourceValidatingWebhookConfigName(wrc.serverIP)) logger.Error(err, "unable to update validatingWebhookConfigurations", "name", getResourceValidatingWebhookConfigName(wrc.serverIP))
go func() { wrc.UpdateWebhookChan <- true }() go func() { wrc.UpdateWebhookChan <- true }()
} else { } else {
logger.Info("successfully updated validatingWebhookConfigurations", "name", getResourceValidatingWebhookConfigName(wrc.serverIP)) logger.V(4).Info("successfully updated validatingWebhookConfigurations", "name", getResourceValidatingWebhookConfigName(wrc.serverIP))
} }
} }
} }