Skip to content

Commit 4d99fa6

Browse files
CSPL-4027: Allow custom labels on helm chart service and service account (#1595)
* Allow custom labels on splunk operator service and serviceaccount through helm * create pvc in correct namespace through helm chart * use correct context for range
1 parent 82a57be commit 4d99fa6

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

helm-chart/splunk-operator/templates/app_download.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
labels:
88
app.kubernetes.io/instance: {{ $.Release.Name }}
99
name: {{ $volume.persistentVolumeClaim.claimName }}
10+
namespace: {{ include "splunk-operator.namespace" $ }}
1011
spec:
1112
accessModes:
1213
- ReadWriteOnce

helm-chart/splunk-operator/templates/service.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ metadata:
44
name: {{ include "splunk-operator.operator.fullname" . }}-controller-manager-service
55
labels:
66
{{- include "splunk-operator.labels" . | nindent 4 }}
7+
{{- if .Values.splunkOperator.labels }}
8+
{{ toYaml .Values.splunkOperator.labels | nindent 4 }}
9+
{{- end }}
710
annotations:
811
{{ toYaml .Values.splunkOperator.annotations | nindent 4 }}
912
spec:

helm-chart/splunk-operator/templates/serviceaccount.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ metadata:
55
namespace: {{ include "splunk-operator.namespace" . }}
66
labels:
77
{{- include "splunk-operator.labels" . | nindent 4 }}
8+
{{- if .Values.splunkOperator.labels }}
9+
{{ toYaml .Values.splunkOperator.labels | nindent 4 }}
10+
{{- end }}
811
annotations:
912
{{ toYaml .Values.splunkOperator.annotations | nindent 4 }}

0 commit comments

Comments
 (0)