openstack/openstack-helm-infra
Code Issues Proposed changes

Removed hard-coded value for backendPort

Browse Source 
This change will retrieve the backend port from values.yaml
instead of a hard-coded value.

Change-Id: I27630d3ead2c8a517f4fe8577e8396776010f9a8
This commit is contained in:
Lo, Chi (cl566n) 2021-04-15 13:03:42 -07:00
parent c60c138777
commit 3b030aa40d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v2.25.0 appVersion: v2.25.0
description: OpenStack-Helm Prometheus description: OpenStack-Helm Prometheus
name: prometheus name: prometheus
version: 0.1.8 version: 0.1.9
home: https://prometheus.io/ home: https://prometheus.io/
sources: sources:
- https://github.com/prometheus/prometheus - https://github.com/prometheus/prometheus

3
prometheus/templates/ingress-prometheus.yaml
View File

@ -14,7 +14,8 @@ limitations under the License.
{{- if and .Values.manifests.ingress .Values.network.prometheus.ingress.public }} {{- if and .Values.manifests.ingress .Values.network.prometheus.ingress.public }}
{{- $envAll := . -}} {{- $envAll := . -}}
{{- $ingressOpts := dict "envAll" $envAll "backendService" "prometheus" "backendServiceType" "monitoring" "backendPort" "https" -}} {{- $port := tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}
{{- $ingressOpts := dict "envAll" $envAll "backendService" "prometheus" "backendServiceType" "monitoring" "backendPort" $port -}}
{{- $secretName := $envAll.Values.secrets.tls.monitoring.prometheus.internal -}} {{- $secretName := $envAll.Values.secrets.tls.monitoring.prometheus.internal -}}
{{- if and .Values.manifests.certificates $secretName -}} {{- if and .Values.manifests.certificates $secretName -}}
{{- $_ := set $ingressOpts "certIssuer" .Values.endpoints.monitoring.host_fqdn_override.default.tls.issuerRef.name -}} {{- $_ := set $ingressOpts "certIssuer" .Values.endpoints.monitoring.host_fqdn_override.default.tls.issuerRef.name -}}

1
releasenotes/notes/prometheus.yaml
View File

@ -9,4 +9,5 @@ prometheus:
- 0.1.6 Upgrade version to v2.25 fix/remove deprecated flags - 0.1.6 Upgrade version to v2.25 fix/remove deprecated flags
- 0.1.7 Enable TLS for Prometheus - 0.1.7 Enable TLS for Prometheus
- 0.1.8 Change readiness probe from /status to /-/ready - 0.1.8 Change readiness probe from /status to /-/ready
- 0.1.9 Retrieve backend port name from values.yaml
... ...