This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 7f2b10c Remove port annotation form prometheusexporter service (#539)
7f2b10c is described below
commit 7f2b10c2fed2f21d0701277e80ede34333bdf89d
Author: Houston Putman <[email protected]>
AuthorDate: Thu Apr 6 16:45:54 2023 -0400
Remove port annotation form prometheusexporter service (#539)
---
controllers/util/prometheus_exporter_util.go | 1 -
helm/solr-operator/Chart.yaml | 7 +++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/controllers/util/prometheus_exporter_util.go
b/controllers/util/prometheus_exporter_util.go
index fd388c4..de70283 100644
--- a/controllers/util/prometheus_exporter_util.go
+++ b/controllers/util/prometheus_exporter_util.go
@@ -406,7 +406,6 @@ func GenerateSolrMetricsService(solrPrometheusExporter
*solr.SolrPrometheusExpor
"prometheus.io/scrape": "true",
"prometheus.io/scheme": "http",
"prometheus.io/path": "/metrics",
- "prometheus.io/port": strconv.Itoa(ExtSolrMetricsPort),
}
selectorLabels := solrPrometheusExporter.SharedLabels()
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 84cadd2..419e588 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -125,6 +125,13 @@ annotations:
url: https://github.com/apache/solr-operator/pull/530
- name: Feature Documentation
url:
https://apache.github.io/solr-operator/docs/solr-cloud/managed-updates.html#pod-readiness-during-updates
+ - kind: fixed
+ description: Don't give port annotation for PrometheusExporter, let
Prometheus find the port itself
+ links:
+ - name: GitHub Issue
+ url: https://github.com/apache/solr-operator/issues/483
+ - name: GitHub PR
+ url: https://github.com/apache/solr-operator/pull/539
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.7.0-prerelease
