[bitnami/postgresql-ha] Fix Double Metrics (#21812)

* Update Service to require it to be enabled

Signed-off-by: Sean Greenawalt <ryuk67@gmail.com>

* Add metrics.service.enabled parameter

Signed-off-by: Sean Greenawalt <ryuk67@gmail.com>

* Add metrics.service.enabled to values.yaml

Signed-off-by: Sean Greenawalt <ryuk67@gmail.com>

* Update chart version

Signed-off-by: Sean Greenawalt <ryuk67@gmail.com>

---------

Signed-off-by: Sean Greenawalt <ryuk67@gmail.com>
This commit is contained in:
Sean Greenawalt
2024-01-08 05:17:55 -05:00
committed by GitHub
parent 3b273bb9cb
commit 9a0533c47c
4 changed files with 7 additions and 3 deletions

View File

@@ -40,4 +40,4 @@ maintainers:
name: postgresql-ha
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/postgresql-ha
version: 12.3.7
version: 12.4.0

View File

@@ -508,6 +508,7 @@ Additionally, if `persistence.resourcePolicy` is set to `keep`, you should manua
| `metrics.customLivenessProbe` | Override default liveness probe | `{}` |
| `metrics.customReadinessProbe` | Override default readiness probe | `{}` |
| `metrics.customStartupProbe` | Override default startup probe | `{}` |
| `metrics.service.enabled` | PostgreSQL Prometheus exporter metrics service enabled | `true` |
| `metrics.service.type` | PostgreSQL Prometheus exporter metrics service type | `ClusterIP` |
| `metrics.service.ports.metrics` | PostgreSQL Prometheus exporter metrics service port | `9187` |
| `metrics.service.nodePorts.metrics` | PostgreSQL Prometheus exporter Node Port | `""` |
@@ -1030,4 +1031,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.

View File

@@ -3,7 +3,7 @@ Copyright VMware, Inc.
SPDX-License-Identifier: APACHE-2.0
*/}}
{{- if .Values.metrics.enabled }}
{{- if and .Values.metrics.enabled .Values.metrics.service.enabled }}
apiVersion: v1
kind: Service
metadata:

View File

@@ -1678,6 +1678,9 @@ metrics:
## Metrics service parameters
##
service:
## @param metrics.service.enabled PostgreSQL Prometheus exporter metrics service enabled
##
enabled: true
## @param metrics.service.type PostgreSQL Prometheus exporter metrics service type
##
type: ClusterIP