Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add recommended Kubernetes labels #217

Merged
merged 14 commits into from
Oct 15, 2021
Merged

Add recommended Kubernetes labels #217

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a4e2ad8
Add label app.kubernetes.io/name
lindhe Oct 7, 2021
7a6e515
Add label app.kubernetes.io/instance
lindhe Oct 7, 2021
9428614
Add label app.kubernetes.io/part-of
lindhe Oct 7, 2021
8bed347
Add label app.kubernetes.io/component
lindhe Oct 7, 2021
0fe7dbb
Add label app.kubernetes.io/managed-by
lindhe Oct 12, 2021
70cb051
Add label helm.sh/chart
lindhe Oct 12, 2021
35eb883
Add label app.kubernetes.io/version based on tag
lindhe Oct 12, 2021
2ff9e0d
Set helm.sh/chart to chart name and version
lindhe Oct 14, 2021
5f664dd
Remove label app.kubernetes.io/part-of
lindhe Oct 14, 2021
05c7928
Define common labels in _helpers.tpl
lindhe Oct 14, 2021
1915c85
Replace individual labels with common labels
lindhe Oct 14, 2021
6ed71d2
Merge branch 'main' into lindhe/recommended-labels
lindhe Oct 15, 2021
02cbdae
Update changelog
lindhe Oct 15, 2021
2f90216
make render
lindhe Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions helm-charts/splunk-otel-collector/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,14 @@ Create an identifier for multiline logs configuration.
{{- end }}
{{- $key | trimSuffix "_" }}
{{- end -}}

{{/*
Common labels shared by all Kubernetes objects in this chart.
*/}}
{{- define "splunk-otel-collector.commonLabels" -}}
app.kubernetes.io/name: {{ include "splunk-otel-collector.name" . }}
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end -}}
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ClusterRole
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ kind: ConfigMap
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-fluentd-cri
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ kind: ConfigMap
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-fluentd-json
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ConfigMap
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-fluentd
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ConfigMap
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-otel-agent
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ConfigMap
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-otel-collector
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: ConfigMap
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-otel-k8s-cluster-receiver
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: DaemonSet
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-agent
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/splunk-otel-collector/templates/deployment-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ kind: Deployment
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
component: otel-collector
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/component: otel-collector
{{- if .Values.otelCollector.annotations }}
annotations:
{{- toYaml .Values.otelCollector.annotations | nindent 4 }}
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ kind: Deployment
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-k8s-cluster-receiver
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
component: otel-k8s-cluster-receiver
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/component: otel-k8s-cluster-receiver
{{- if .Values.otelK8sClusterReceiver.annotations }}
annotations:
{{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }}
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/splunk-otel-collector/templates/pdb-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ kind: PodDisruptionBudget
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
component: otel-collector
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/component: otel-collector
spec:
selector:
matchLabels:
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ kind: PodDisruptionBudget
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}-otel-k8s-cluster-receiver
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
component: otel-k8s-cluster-receiver
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/component: otel-k8s-cluster-receiver
spec:
selector:
matchLabels:
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ kind: Secret
metadata:
name: {{ template "splunk-otel-collector.secret" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: security.openshift.io/v1
metadata:
name: {{ template "splunk-otel-collector.serviceAccountName" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/splunk-otel-collector/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ kind: Service
metadata:
name: {{ template "splunk-otel-collector.fullname" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
component: otel-collector
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/component: otel-collector
{{- with .Values.service.annotations }}
annotations:
{{ toYaml . | trim | indent 4 }}
Expand Down
1 change: 1 addition & 0 deletions helm-charts/splunk-otel-collector/templates/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ kind: ServiceAccount
metadata:
name: {{ template "splunk-otel-collector.serviceAccountName" . }}
labels:
{{- include "splunk-otel-collector.commonLabels" . | nindent 4 }}
app: {{ template "splunk-otel-collector.name" . }}
chart: {{ template "splunk-otel-collector.chart" . }}
release: {{ .Release.Name }}
Expand Down