volker.raschekandCopilot
a4c6893874
The names of the Secrets rendered by the chart were built inline in each template and, for two of them, in ad-hoc chart-wide helpers. The same name therefore existed in several places (Deployment volumes, ServiceMonitor credentials, the Secret templates themselves), which made every rename a multi-file change and allowed the references to drift apart unnoticed - the Helm unit tests render one template at a time and cannot detect a mismatching secretName. All Secret names are now defined once in templates/gitea/_secrets.tpl: gitea.secret.config.name -> <fullname>-config gitea.secret.gpg.name -> <fullname>-gpg-key (or signing.existingSecret) gitea.secret.init.name -> <fullname>-init gitea.secret.inlineConfig.name -> <fullname>-inline-config gitea.secret.metrics.name -> <fullname>-metrics gitea.gpg-key-secret-name and gitea.metrics-secret-name are removed from _helpers.tpl accordingly. A checksum/inlineConfig pod annotation is added as well. After the inline configuration had been split out of secret_config.yaml, changes to it were no longer covered by any checksum annotation and did not trigger a rollout of the Deployment. Finally the metadata attributes of the Secret templates are sorted alphabetically as required by the chart conventions. BREAKING CHANGE: two Secrets are renamed. The config Secret changes from <fullname> to <fullname>-config and the metrics Secret from <fullname>-metrics-secret to <fullname>-metrics. Helm replaces both on upgrade; references to them from outside the chart have to be adjusted. Co-authored-by: Copilot <copilot@github.com>
43 lines
1.5 KiB
YAML
43 lines
1.5 KiB
YAML
{{- if and .Values.gitea.metrics.enabled .Values.gitea.metrics.serviceMonitor.enabled -}}
|
|
apiVersion: monitoring.coreos.com/v1
|
|
kind: ServiceMonitor
|
|
metadata:
|
|
name: {{ include "gitea.fullname" . }}
|
|
namespace: {{ .Values.namespace | default .Release.Namespace }}
|
|
labels:
|
|
{{- include "gitea.labels" . | nindent 4 }}
|
|
{{- if .Values.gitea.metrics.serviceMonitor.additionalLabels }}
|
|
{{- toYaml .Values.gitea.metrics.serviceMonitor.additionalLabels | nindent 4 }}
|
|
{{- end }}
|
|
spec:
|
|
selector:
|
|
matchLabels:
|
|
{{- include "gitea.selectorLabels" . | nindent 6 }}
|
|
endpoints:
|
|
- port: http
|
|
{{- if .Values.gitea.metrics.serviceMonitor.interval }}
|
|
interval: {{ .Values.gitea.metrics.serviceMonitor.interval }}
|
|
{{- end }}
|
|
{{- with .Values.gitea.metrics.serviceMonitor.relabelings }}
|
|
relabelings:
|
|
{{- . | toYaml | nindent 6 }}
|
|
{{- end }}
|
|
{{- if .Values.gitea.metrics.serviceMonitor.scheme }}
|
|
scheme: {{ .Values.gitea.metrics.serviceMonitor.scheme }}
|
|
{{- end }}
|
|
{{- if .Values.gitea.metrics.serviceMonitor.scrapeTimeout }}
|
|
scrapeTimeout: {{ .Values.gitea.metrics.serviceMonitor.scrapeTimeout }}
|
|
{{- end }}
|
|
{{- with .Values.gitea.metrics.serviceMonitor.tlsConfig }}
|
|
tlsConfig:
|
|
{{- . | toYaml | nindent 6 }}
|
|
{{- end }}
|
|
{{- if .Values.gitea.metrics.token }}
|
|
authorization:
|
|
type: Bearer
|
|
credentials:
|
|
name: {{ include "gitea.secret.metrics.name" . }}
|
|
key: token
|
|
optional: false
|
|
{{- end }}
|
|
{{- end -}} |