Merge pull request #814 from pgier/thanos-ruler-cleanup

Bug 1845825: Cleanup thanos ruler route when user workload monitoring is disabled

Author: openshift-merge-robot

pkg/client/client.go

@@ -552,6 +552,14 @@ func (c *Client) DeleteService(svc *v1.Service) error {
 	return err
 }
 
+func (c *Client) DeleteRoute(r *routev1.Route) error {
+	err := c.osrclient.RouteV1().Routes(r.GetNamespace()).Delete(r.GetName(), &metav1.DeleteOptions{})
+	if apierrors.IsNotFound(err) {
+		return nil
+	}
+	return err
+}
+
 func (c *Client) DeletePrometheusRule(rule *monv1.PrometheusRule) error {
 	err := c.mclient.MonitoringV1().PrometheusRules(rule.GetNamespace()).Delete(rule.GetName(), &metav1.DeleteOptions{})
 	if apierrors.IsNotFound(err) {

pkg/tasks/thanos_ruler_user_workload.go

@@ -251,7 +251,17 @@ func (t *ThanosRulerUserWorkloadTask) destroy() error {
 
 	err = t.client.DeletePrometheusRule(prmrl)
 	if err != nil {
-		return errors.Wrap(err, "reconciling Thanos Ruler PrometheusRule failed")
+		return errors.Wrap(err, "deleting Thanos Ruler PrometheusRule failed")
+	}
+
+	route, err := t.factory.ThanosRulerRoute()
+	if err != nil {
+		return errors.Wrap(err, "initializing Thanos Ruler Route failed")
+	}
+
+	err = t.client.DeleteRoute(route)
+	if err != nil {
+		return errors.Wrap(err, "deleting Thanos Ruler Route failed")
 	}
 
 	svc, err := t.factory.ThanosRulerService()
@@ -271,12 +281,12 @@ func (t *ThanosRulerUserWorkloadTask) destroy() error {
 
 	err = t.client.DeleteClusterRole(cr)
 	if err != nil {
-		return errors.Wrap(err, "reconciling Thanos Ruler ClusterRole failed")
+		return errors.Wrap(err, "deleting Thanos Ruler ClusterRole failed")
 	}
 
 	crb, err := t.factory.ThanosRulerClusterRoleBinding()
 	if err != nil {
-		return errors.Wrap(err, "deleting Thanos Ruler ClusterRoleBinding failed")
+		return errors.Wrap(err, "initializing Thanos Ruler ClusterRoleBinding failed")
 	}
 
 	err = t.client.DeleteClusterRoleBinding(crb)