Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4ecf401

Browse files
author
Alexander Davis
authored
Allow custom labels on daemonset/deployment/pods (#749)
* Enable people to add extra (custom) labels * add custom labels to deployment and daemonsets * Add custom labels to metricAgg deploy template * Metrics agg should get own extraLabels
1 parent 23edea6 commit 4ecf401

File tree

8 files changed

+52
-4
lines changed

8 files changed

+52
-4
lines changed

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/daemonset.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
release: {{ .Release.Name }}
99
heritage: {{ .Release.Service }}
1010
engine: fluentd
11+
{{- if .Values.extraLabels }}
12+
{{ toYaml .Values.extraLabels | indent 4 }}
13+
{{- end }}
1114
spec:
1215
updateStrategy:
1316
type: RollingUpdate
@@ -20,6 +23,9 @@ spec:
2023
labels:
2124
app: {{ template "splunk-kubernetes-logging.name" . }}
2225
release: {{ .Release.Name }}
26+
{{- if .Values.extraLabels }}
27+
{{ toYaml .Values.extraLabels | indent 8 }}
28+
{{- end }}
2329
annotations:
2430
checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }}
2531
{{- if .Values.global.prometheus_enabled }}

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,9 @@ environmentVar:
339339
# Pod annotations for daemonset
340340
podAnnotations:
341341

342+
# Extra labels for daemonset, pods
343+
extraLabels:
344+
342345
# Controls the resources used by the fluentd daemonset
343346
resources:
344347
# limits:

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/daemonset.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
heritage: {{ .Release.Service }}
1010
component: collector
1111
engine: fluentd
12+
{{- if .Values.extraLabels }}
13+
{{ toYaml .Values.extraLabels | indent 4 }}
14+
{{- end }}
1215
spec:
1316
updateStrategy:
1417
type: RollingUpdate
@@ -27,6 +30,9 @@ spec:
2730
heritage: {{ .Release.Service }}
2831
component: collector
2932
engine: fluentd
33+
{{- if .Values.extraLabels }}
34+
{{ toYaml .Values.extraLabels | indent 8 }}
35+
{{- end }}
3036
annotations:
3137
scheduler.alpha.kubernetes.io/critical-pod: ''
3238
checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }}

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/templates/deploymentMetricsAggregator.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
release: {{ .Release.Name }}
99
heritage: {{ .Release.Service }}
1010
component: aggregator
11+
{{- if .Values.extraLabelsAgg }}
12+
{{ toYaml .Values.extraLabelsAgg | indent 4 }}
13+
{{- end }}
1114
spec:
1215
strategy:
1316
type: RollingUpdate
@@ -24,6 +27,9 @@ spec:
2427
chart: {{ template "splunk-kubernetes-metrics.chart" . }}
2528
release: {{ .Release.Name }}
2629
component: aggregator
30+
{{- if .Values.extraLabelsAgg }}
31+
{{ toYaml .Values.extraLabelsAgg | indent 8 }}
32+
{{- end }}
2733
annotations:
2834
scheduler.alpha.kubernetes.io/critical-pod: ''
2935
checksum/config: {{ include (print $.Template.BasePath "/configMapMetricsAggregator.yaml") . | sha256sum }}

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-metrics/values.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ podAnnotations:
127127
# Pod annotations for metrics aggregator pod
128128
podAnnotationsAgg:
129129

130+
# Extra labels for metrics daemonset, pods
131+
extraLabels:
132+
133+
# Extra labels for metrics aggregator deployment, pods
134+
extraLabelsAgg:
135+
130136
# Controls the resources used by the fluentd daemonset
131137
resources:
132138
fluent:

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/templates/deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ metadata:
77
chart: {{ template "splunk-kubernetes-objects.chart" . }}
88
release: {{ .Release.Name }}
99
heritage: {{ .Release.Service }}
10+
{{- if .Values.extraLabels }}
11+
{{ toYaml .Values.extraLabels | indent 4 }}
12+
{{- end }}
1013
spec:
1114
strategy:
1215
type: RollingUpdate
@@ -22,6 +25,9 @@ spec:
2225
app: {{ template "splunk-kubernetes-objects.name" . }}
2326
release: {{ .Release.Name }}
2427
engine: fluentd
28+
{{- if .Values.extraLabels }}
29+
{{ toYaml .Values.extraLabels | indent 8 }}
30+
{{- end }}
2531
annotations:
2632
checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }}
2733
{{- if .Values.podAnnotations }}

‎helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-objects/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,9 @@ environmentVar:
214214
# Pod annotations for object pod
215215
podAnnotations:
216216

217+
# Extra labels for object deployment, pods
218+
extraLabels:
219+
217220
# = Resoruce Limitation Configs =
218221
resources:
219222
# limits:

‎helm-chart/splunk-connect-for-kubernetes/values.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,12 @@ splunk-kubernetes-logging:
411411
# Environment variable for daemonset
412412
environmentVar:
413413

414-
# Pod annotations for object pod
414+
# Pod annotations for logging pod
415415
podAnnotations:
416416

417+
# Extra labels for logging daemonset, pods
418+
extraLabels:
419+
417420
# Controls the resources used by the fluentd daemonset
418421
resources:
419422
# limits:
@@ -751,12 +754,15 @@ splunk-kubernetes-objects:
751754
# The name of the pull secret to attach to the respective serviceaccount used to pull the image
752755
pullSecretName:
753756

754-
# Environment variable for metrics daemonset
757+
# Environment variable for objects daemonset
755758
environmentVar:
756759

757-
# Pod annotations for metrics daemonset
760+
# Pod annotations for objects daemonset
758761
podAnnotations:
759762

763+
# Extra labels for objects daemonset, pods
764+
extraLabels:
765+
760766
# = Resource Limitation Configs =
761767
resources:
762768
# limits:
@@ -981,7 +987,13 @@ splunk-kubernetes-metrics:
981987
podAnnotations:
982988

983989
# Pod annotations for metrics aggregator pod
984-
podAnnotationsAgg:
990+
podAnnotationsAgg:
991+
992+
# Extra labels for metrics aggregator daemonset, pods
993+
extraLabels:
994+
995+
# Extra labels for metrics aggregator deployment, pods
996+
extraLabelsAgg:
985997

986998
# Controls the resources used by the fluentd daemonset
987999
resources:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /