Skip to content

Commit 8f15725

Browse files
authored
CP-24833: template KSM service address using the release name (#140)
1 parent c9615d5 commit 8f15725

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

charts/cloudzero-agent/docs/releases/1.0.0-beta-9.md

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Upgrade using the following command:
1010
helm upgrade --install <RELEASE_NAME> cloudzero-beta/cloudzero-agent -n <NAMESPACE> --create-namespace -f configuration.example.yaml --version 1.0.0-beta-9
1111
```
1212

13+
### Bug Fixes
14+
* **KSM Address:** Fixes an issue in which the internal `kube-state-metrics` service address can be templated incorrectly.
15+
1316
### Improvements
1417
* **More Configurable Server Settings:** The log level, remote write interval, and remote write timeout are now configurable in the chart values. See the `insightsController.server` section in the `values.yaml` for more details.
1518
* **Default Setting for Send Timeout:** The default remote write timeout is increased to `1m`, which allows for backfilling data from larger clusters.

charts/cloudzero-agent/templates/_helpers.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ KubeStateMetrics target override
171171
*/}}
172172
{{- define "cloudzero-agent.kubeStateMetrics.targetOverride" -}}
173173
{{- if .Values.kubeStateMetrics.enabled -}}
174-
{{ printf "%s.%s.svc.cluster.local:%d" .Values.kubeStateMetrics.nameOverride .Release.Namespace (int .Values.kubeStateMetrics.service.port) }}
174+
{{ printf "%s-%s.%s.svc.cluster.local:%d" .Release.Name .Values.kubeStateMetrics.nameOverride .Release.Namespace (int .Values.kubeStateMetrics.service.port) }}
175175
{{- else -}}
176176
{{- if not .Values.kubeStateMetrics.targetOverride }}
177177
{{- required "You must set a targetOverride for kubeStateMetrics" .Values.kubeStateMetrics.targetOverride -}}

charts/cloudzero-agent/templates/validatorcm.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ data:
3333
{{- if .Values.validator.serviceEndpoints.kubeStateMetrics }}
3434
kube_state_metrics_service_endpoint: http://{{ .Values.validator.serviceEndpoints.kubeStateMetrics }}/
3535
{{- else }}
36-
kube_state_metrics_service_endpoint: http://{{ .Values.kubeStateMetrics.nameOverride }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.kubeStateMetrics.service.port }}
37-
{{- end }}
38-
{{- if .Values.validator.serviceEndpoints.prometheusNodeExporter }}
39-
prometheus_node_exporter_service_endpoint: http://{{ .Values.validator.serviceEndpoints.prometheusNodeExporter }}/
40-
{{- else }}
41-
prometheus_node_exporter_service_endpoint: http://{{- if .Release.Name }}{{.Release.Name}}-{{- end }}prometheus-node-exporter:9100/
36+
kube_state_metrics_service_endpoint: http://{{ include "cloudzero-agent.kubeStateMetrics.targetOverride" . }}
4237
{{- end }}
4338
executable: /bin/prometheus
4439
kube_metrics:

0 commit comments

Comments
 (0)