Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-02-18 18:57:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix metrics (#8695)

Browse Source 
Signed-off-by: Alejandro Moreno <amorenoc@vmware.com>
This commit is contained in:
Alejandro Moreno
2022-01-18 09:25:30 +01:00
committed by GitHub
parent f4f352fe9f
commit e71d38ea4e
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/spring-cloud-dataflow/Chart.yaml
View File

@@ -39,4 +39,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow
- https://github.com/bitnami/bitnami-docker-spring-cloud-skipper
- https://dataflow.spring.io/
version: 5.0.2
version: 5.0.3

34
bitnami/spring-cloud-dataflow/templates/prometheus-proxy/service.yaml
View File

@@ -17,32 +17,32 @@ metadata:
{{- include "common.tplvalues.render" ( dict "value" .Values.metrics.service.annotations "context" $) | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.service.type }}
{{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }}
clusterIP: {{ .Values.service.clusterIP }}
type: {{ .Values.metrics.service.type }}
{{- if and .Values.metrics.service.clusterIP (eq .Values.metrics.service.type "ClusterIP") }}
clusterIP: {{ .Values.metrics.service.clusterIP }}
{{- end }}
{{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }}
externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }}
{{- if or (eq .Values.metrics.service.type "LoadBalancer") (eq .Values.metrics.service.type "NodePort") }}
externalTrafficPolicy: {{ .Values.metrics.service.externalTrafficPolicy | quote }}
{{- end }}
{{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.service.loadBalancerSourceRanges | nindent 4 }}
{{- if and (eq .Values.metrics.service.type "LoadBalancer") .Values.metrics.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges: {{- toYaml .Values.metrics.service.loadBalancerSourceRanges | nindent 4 }}
{{- end }}
{{- if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.service.loadBalancerIP }}
{{- if (and (eq .Values.metrics.service.type "LoadBalancer") (not (empty .Values.metrics.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
{{- end }}
{{- if .Values.service.sessionAffinity }}
sessionAffinity: {{ .Values.service.sessionAffinity }}
{{- if .Values.metrics.service.sessionAffinity }}
sessionAffinity: {{ .Values.metrics.service.sessionAffinity }}
{{- end }}
{{- if .Values.service.sessionAffinityConfig }}
sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.sessionAffinityConfig "context" $) | nindent 4 }}
{{- if .Values.metrics.service.sessionAffinityConfig }}
sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.metrics.service.sessionAffinityConfig "context" $) | nindent 4 }}
{{- end }}
ports:
- name: http
port: {{ coalesce .Values.metrics.service.ports.http .Values.metrics.service.httpPort }}
protocol: TCP
targetPort: http
{{- if and .Values.service.nodePorts.http (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) }}
nodePort: {{ .Values.service.nodePorts.http }}
{{- if and .Values.metrics.service.nodePorts.http (or (eq .Values.metrics.service.type "NodePort") (eq .Values.metrics.service.type "LoadBalancer")) }}
nodePort: {{ .Values.metrics.service.nodePorts.http }}
{{- else }}
nodePort: null
{{- end }}
@@ -50,8 +50,8 @@ spec:
port: {{ coalesce .Values.metrics.service.ports.rsocket .Values.metrics.service.rsocketPort }}
protocol: TCP
targetPort: rsocket
{{- if and .Values.service.nodePorts.rsocket (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) }}
nodePort: {{ .Values.service.nodePorts.rsocket }}
{{- if and .Values.metrics.service.nodePorts.rsocket (or (eq .Values.metrics.service.type "NodePort") (eq .Values.metrics.service.type "LoadBalancer")) }}
nodePort: {{ .Values.metrics.service.nodePorts.rsocket }}
{{- else }}
nodePort: null
{{- end }}

2
bitnami/spring-cloud-dataflow/values.yaml
View File

@@ -1261,7 +1261,7 @@ metrics:
##
annotations:
prometheus.io/scrape: 'true'
prometheus.io/port: '{{ coalesce .Values.metrics.service.ports.http .Values.metrics.service.httpPort }}'
prometheus.io/port: '{{ .Values.metrics.service.ports.http }}'
prometheus.io/path: '/metrics/proxy'
## @param metrics.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP"
## If "ClientIP", consecutive client requests will be directed to the same Pod