jenkins: update to 2.568.1 LTS and chart
Change-Id: Ib6b48599a09dee669d77441c12b354240ef257b8
diff --git a/charts/jenkins/templates/secret-claims.yaml b/charts/jenkins/templates/secret-claims.yaml
index e8b6d6c..b47c7bd 100644
--- a/charts/jenkins/templates/secret-claims.yaml
+++ b/charts/jenkins/templates/secret-claims.yaml
@@ -1,7 +1,5 @@
{{- if .Values.controller.secretClaims -}}
-{{- $r := .Release -}}
-{{- $v := .Values -}}
-{{- $chart := printf "%s-%s" .Chart.Name .Chart.Version -}}
+{{- $root := . -}}
{{- $namespace := include "jenkins.namespace" . -}}
{{- $serviceName := include "jenkins.fullname" . -}}
{{ range .Values.controller.secretClaims }}
@@ -12,13 +10,9 @@
name: {{ $serviceName }}-{{ .name | default .path | lower }}
namespace: {{ $namespace }}
labels:
- "app.kubernetes.io/name": '{{ $serviceName }}'
- {{- if $v.renderHelmLabels }}
- "helm.sh/chart": "{{ $chart }}"
- {{- end }}
- "app.kubernetes.io/managed-by": "{{ $r.Service }}"
- "app.kubernetes.io/instance": "{{ $r.Name }}"
- "app.kubernetes.io/component": "{{ $v.controller.componentName }}"
+ {{- $baseLabels := include "jenkins.labels" $root | fromYaml }}
+ {{- $overrideLabels := dict "app.kubernetes.io/name" $serviceName }}
+ {{- toYaml (merge $overrideLabels $baseLabels) | nindent 4 }}
spec:
type: {{ .type | default "Opaque" }}
path: {{ .path }}
@@ -26,4 +20,4 @@
renew: {{ .renew }}
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}