Merge pull request prometheus-operator#2978 from pgier/deprecation-wa…

…rning-verbosity reduce verbosity of deprecation checks
damienleger · Jan 30, 2020 · a3789c9 · a3789c9
2 parents 35e33b1 + 080de81
commit a3789c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/alertmanager/operator.go b/pkg/alertmanager/operator.go
@@ -369,6 +369,7 @@ func (c *Operator) handleAlertmanagerAdd(obj interface{}) {
 
 	level.Debug(c.logger).Log("msg", "Alertmanager added", "key", key)
 	c.metrics.TriggerByCounter(monitoringv1.AlertmanagersKind, "add").Inc()
+	checkAlertmanagerSpecDeprecation(key, obj.(*monitoringv1.Alertmanager), c.logger)
 	c.enqueue(key)
 }
 
@@ -391,6 +392,7 @@ func (c *Operator) handleAlertmanagerUpdate(old, cur interface{}) {
 
 	level.Debug(c.logger).Log("msg", "Alertmanager updated", "key", key)
 	c.metrics.TriggerByCounter(monitoringv1.AlertmanagersKind, "update").Inc()
+	checkAlertmanagerSpecDeprecation(key, cur.(*monitoringv1.Alertmanager), c.logger)
 	c.enqueue(key)
 }
 
@@ -455,7 +457,6 @@ func (c *Operator) sync(key string) error {
 	}
 
 	level.Info(c.logger).Log("msg", "sync alertmanager", "key", key)
-	checkAlertmanagerSpecDeprecation(key, am, c.logger)
 
 	// Create governing service if it doesn't exist.
 	svcClient := c.kclient.CoreV1().Services(am.Namespace)

diff --git a/pkg/prometheus/operator.go b/pkg/prometheus/operator.go
@@ -510,6 +510,7 @@ func (c *Operator) handlePrometheusAdd(obj interface{}) {
 
 	level.Debug(c.logger).Log("msg", "Prometheus added", "key", key)
 	c.metrics.TriggerByCounter(monitoringv1.PrometheusesKind, "add").Inc()
+	checkPrometheusSpecDeprecation(key, obj.(*monitoringv1.Prometheus), c.logger)
 	c.enqueue(key)
 }
 
@@ -536,6 +537,7 @@ func (c *Operator) handlePrometheusUpdate(old, cur interface{}) {
 
 	level.Debug(c.logger).Log("msg", "Prometheus updated", "key", key)
 	c.metrics.TriggerByCounter(monitoringv1.PrometheusesKind, "update").Inc()
+	checkPrometheusSpecDeprecation(key, cur.(*monitoringv1.Prometheus), c.logger)
 	c.enqueue(key)
 }
 
@@ -1083,7 +1085,6 @@ func (c *Operator) sync(key string) error {
 	}
 
 	level.Info(c.logger).Log("msg", "sync prometheus", "key", key)
-	checkPrometheusSpecDeprecation(key, p, c.logger)
 	ruleConfigMapNames, err := c.createOrUpdateRuleConfigMaps(p)
 	if err != nil {
 		return err