Do not return metrics for liveness probe (#694)

Fixes #693
apache · Apr 3, 2024 · 73cffd0 · 73cffd0
1 parent 106fdfa
commit 73cffd0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/controllers/util/prometheus_exporter_util.go b/controllers/util/prometheus_exporter_util.go
@@ -207,8 +207,9 @@ func GenerateSolrPrometheusExporterDeployment(solrPrometheusExporter *solr.SolrP
 	defaultProbeHandler := corev1.ProbeHandler{
 		HTTPGet: &corev1.HTTPGetAction{
 			Scheme: corev1.URISchemeHTTP,
-			Path:   "/metrics",
-			Port:   intstr.FromInt(SolrMetricsPort),
+			// TODO: When 9.0 is the minimum supported version, this can be "/-/healthy"
+			Path: "/metrics?names[]=",
+			Port: intstr.FromInt(SolrMetricsPort),
 		},
 	}
 

diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
@@ -69,12 +69,19 @@ annotations:
         - name: Github PR
           url: https://github.com/apache/solr-operator/pull/648
     - kind: fixed
-      description: SolrCloud scaling is now safe when using persistent storage with a 'Delete' reclaim policy  
+      description: SolrCloud scaling is now safe when using persistent storage with a 'Delete' reclaim policy
       links:
         - name: Github Issue
           url: https://github.com/apache/solr-operator/issues/688
         - name: Github PR
           url: https://github.com/apache/solr-operator/pull/689
+    - kind: fixed
+      description: SolrPrometheusExporter no longer fails liveness probes when the SolrCloud is too large
+      links:
+        - name: Github Issue
+          url: https://github.com/apache/solr-operator/issues/693
+        - name: Github PR
+          url: https://github.com/apache/solr-operator/pull/694
   artifacthub.io/images: |
     - name: solr-operator
       image: apache/solr-operator:v0.8.1-prerelease