github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/filebeat] Use labels recommended by Helm (#15696)

Browse Source 
See https://helm.sh/docs/chart_best_practices/#standard-labels

Since the DaemonSet's selector is immutable, this is breaking change and will require a deletion and recreation, hence the major version bump.

Signed-off-by: Peter Rifel <pgrifel@gmail.com>
This commit is contained in:
Peter Rifel
2019-08-17 08:34:07 -07:00
committed by Kubernetes Prow Robot
parent f2fdf5332e
commit 9b00917068
10 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/filebeat/Chart.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
description: A Helm chart to collect Kubernetes logs with filebeat
icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg
name: filebeat
version: 2.0.2
version: 3.0.0
appVersion: 7.0.1
home: https://www.elastic.co/products/beats/filebeat
sources:
stable/filebeat/templates/clusterrole.yaml
+4 -4
View File
@@ -4,10 +4,10 @@ kind: ClusterRole
metadata:
name: {{ template "filebeat.fullname" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ template "filebeat.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
rules:
- apiGroups: [""]
resources:
stable/filebeat/templates/clusterrolebinding.yaml
+4 -4
View File
@@ -4,10 +4,10 @@ kind: ClusterRoleBinding
metadata:
name: {{ template "filebeat.fullname" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ template "filebeat.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
stable/filebeat/templates/daemonset.yaml
+8 -8
View File
@@ -3,15 +3,15 @@ kind: DaemonSet
metadata:
name: {{ template "filebeat.fullname" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ template "filebeat.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
selector:
matchLabels:
app: {{ template "filebeat.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
minReadySeconds: 10
updateStrategy:
type: RollingUpdate
@@ -20,8 +20,8 @@ spec:
template:
metadata:
labels:
app: {{ template "filebeat.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
annotations:
checksum/secret: {{ toYaml (default .Values.config .Values.overrideConfig) | sha256sum }}
{{- if .Values.annotations }}
stable/filebeat/templates/role.yaml
+4 -4
View File
@@ -5,10 +5,10 @@ kind: Role
metadata:
name: {{ template "filebeat.fullname" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
namespace: {{ .Release.Namespace }}
rules:
- apiGroups: ['extensions']
stable/filebeat/templates/rolebinding.yaml
+4 -4
View File
@@ -5,10 +5,10 @@ kind: RoleBinding
metadata:
name: {{ template "filebeat.fullname" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
namespace: {{ .Release.Namespace }}
roleRef:
kind: Role
stable/filebeat/templates/secret.yaml
+4 -4
View File
@@ -3,10 +3,10 @@ kind: Secret
metadata:
name: {{ template "filebeat.fullname" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ template "filebeat.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
type: Opaque
data:
filebeat.yml: {{ toYaml (default .Values.config .Values.overrideConfig) | indent 4 | b64enc }}
stable/filebeat/templates/service.yaml
+6 -5
View File
@@ -15,13 +15,14 @@ metadata:
name: {{ template "filebeat.fullname" . }}-metrics
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ template "filebeat.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
selector:
app: {{ template "filebeat.name" . }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
ports:
- name: metrics
port: {{ .Values.monitoring.exporterPort }}
stable/filebeat/templates/serviceaccount.yaml
+4 -4
View File
@@ -4,8 +4,8 @@ kind: ServiceAccount
metadata:
name: {{ template "filebeat.serviceAccountName" . }}
labels:
app: {{ template "filebeat.name" . }}
chart: {{ template "filebeat.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
helm.sh/chart: {{ template "filebeat.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
stable/filebeat/templates/servicemonitor.yaml
+2 -2
View File
@@ -25,6 +25,6 @@ spec:
- {{ .Release.Namespace }}
selector:
matchLabels:
app: {{ template "filebeat.name" . }}
release: {{ .Release.Name }}
app.kubernetes.io/name: {{ template "filebeat.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}