File 0024-update-microshift-vendor.patch of Package micro-okd
From 9b343e06378706f88b40b40320f54e26d220c974 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <git@johannes-kastl.de>
Date: Mon, 16 Jun 2025 11:18:26 +0200
Subject: [PATCH] update microshift/vendor
Signed-off-by: Johannes Kastl <git@johannes-kastl.de>
---
.../pkg/route/ingress/ingress.go | 1 -
.../pkg/route/ingress/metrics.go | 9 ---------
vendor/modules.txt | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/ingress.go b/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/ingress.go
index 71ecf18b5..6b5c0c6b1 100644
--- a/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/ingress.go
+++ b/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/ingress.go
@@ -377,7 +377,6 @@ func (c *Controller) sync(key queueKey) error {
ingress, err := c.ingressLister.Ingresses(key.namespace).Get(key.name)
if kerrors.IsNotFound(err) {
- c.ResetIngressMetrics(key.namespace, key.name)
return nil
}
if err != nil {
diff --git a/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/metrics.go b/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/metrics.go
index 2f5f41897..c60548dff 100644
--- a/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/metrics.go
+++ b/vendor/github.com/openshift/route-controller-manager/pkg/route/ingress/metrics.go
@@ -106,12 +106,3 @@ func (c *Controller) Collect(ch chan<- prometheus.Metric) {
unmanagedRoutes.Collect(ch)
}
-
-// ResetIngressMetrics clears metrics for the specified ingress by setting its
-// series data to 0. This is appropriate to do when an ingress object is
-// deleted to prevent stale metrics from triggering alerts. As Collect only
-// updates metrics for ingresses that exist at the time when Collect is called,
-// it does not clear metrics for deleted routes.
-func (c *Controller) ResetIngressMetrics(namespace, ingressName string) {
- ingressesWithoutClassName.WithLabelValues(ingressName, namespace).Set(0.0)
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 740500ace..3e6ac43cd 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -738,7 +738,7 @@ github.com/openshift/library-go/pkg/route/validation
github.com/openshift/library-go/pkg/security/ldaputil
github.com/openshift/library-go/pkg/security/uid
github.com/openshift/library-go/pkg/serviceability
-# github.com/openshift/route-controller-manager v0.0.0-20241025105230-07daee4d2f0b
+# github.com/openshift/route-controller-manager v0.0.0-20240911174253-87dfd7936fc5
## explicit; go 1.22.0
github.com/openshift/route-controller-manager/pkg/cmd/controller
github.com/openshift/route-controller-manager/pkg/cmd/route-controller-manager
--
2.49.0