-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2039 from zanac1986/fix-promtail-refactor
[promtail] Refactor
- Loading branch information
Showing
12 changed files
with
170 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,118 @@ | ||
| {{/* | ||
| Pod template used in Daemonset and Deployment | ||
| */}} | ||
| {{- define "promtail.podTemplate" }} | ||
| metadata: | ||
| labels: | ||
| {{- include "promtail.selectorLabels" . | nindent 8 }} | ||
| {{- with .Values.podLabels }} | ||
| {{- define "promtail.podTemplate" -}} | ||
| metadata: | ||
| labels: | ||
| {{- include "promtail.selectorLabels" . | nindent 4 }} | ||
| {{- with .Values.podLabels }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| annotations: | ||
| checksum/config: {{ include (print .Template.BasePath "/secret.yaml") . | sha256sum }} | ||
| {{- with .Values.podAnnotations }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| serviceAccountName: {{ include "promtail.serviceAccountName" . }} | ||
| {{- include "promtail.enableServiceLinks" . | nindent 2 }} | ||
| {{- with .Values.priorityClassName }} | ||
| priorityClassName: {{ . }} | ||
| {{- end }} | ||
| {{- with .Values.initContainer }} | ||
| initContainers: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- with .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| securityContext: | ||
| {{- toYaml .Values.podSecurityContext | nindent 4 }} | ||
| containers: | ||
| - name: promtail | ||
| image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" | ||
| imagePullPolicy: {{ .Values.image.pullPolicy }} | ||
| args: | ||
| - "-config.file=/etc/promtail/promtail.yaml" | ||
| {{- with .Values.extraArgs }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| annotations: | ||
| checksum/config: {{ include (print .Template.BasePath "/secret.yaml") . | sha256sum }} | ||
| {{- with .Values.podAnnotations }} | ||
| volumeMounts: | ||
| - name: config | ||
| mountPath: /etc/promtail | ||
| {{- with .Values.defaultVolumeMounts }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| spec: | ||
| serviceAccountName: {{ include "promtail.serviceAccountName" . }} | ||
| {{ include "promtail.enableServiceLinks" . }} | ||
| {{- with .Values.priorityClassName }} | ||
| priorityClassName: {{ . }} | ||
| {{- end }} | ||
| {{- with .Values.initContainer }} | ||
| initContainers: | ||
| {{- with .Values.extraVolumeMounts }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| env: | ||
| - name: HOSTNAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| {{- with .Values.extraEnv }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- with .Values.extraEnvFrom }} | ||
| envFrom: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| ports: | ||
| - name: http-metrics | ||
| containerPort: {{ .Values.config.serverPort }} | ||
| protocol: TCP | ||
| {{- range $key, $values := .Values.extraPorts }} | ||
| - name: {{ .name | default $key }} | ||
| containerPort: {{ $values.containerPort }} | ||
| protocol: {{ $values.protocol | default "TCP" }} | ||
| {{- end }} | ||
| securityContext: | ||
| {{- toYaml .Values.podSecurityContext | nindent 8 }} | ||
| containers: | ||
| - name: promtail | ||
| image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" | ||
| imagePullPolicy: {{ .Values.image.pullPolicy }} | ||
| args: | ||
| - "-config.file=/etc/promtail/promtail.yaml" | ||
| {{- with .Values.extraArgs }} | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| volumeMounts: | ||
| - name: config | ||
| mountPath: /etc/promtail | ||
| {{- with .Values.defaultVolumeMounts }} | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| {{- with .Values.extraVolumeMounts }} | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| env: | ||
| - name: HOSTNAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| {{- with .Values.extraEnv }} | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| {{- with .Values.extraEnvFrom }} | ||
| envFrom: | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| ports: | ||
| - name: http-metrics | ||
| containerPort: {{ .Values.config.serverPort }} | ||
| protocol: TCP | ||
| {{- range $key, $values := .Values.extraPorts }} | ||
| - name: {{ .name | default $key }} | ||
| containerPort: {{ $values.containerPort }} | ||
| protocol: {{ $values.protocol | default "TCP" }} | ||
| {{- end }} | ||
| securityContext: | ||
| {{- toYaml .Values.containerSecurityContext | nindent 12 }} | ||
| {{- with .Values.livenessProbe }} | ||
| livenessProbe: | ||
| {{- tpl (toYaml .) $ | nindent 12 }} | ||
| {{- end }} | ||
| {{- with .Values.readinessProbe }} | ||
| readinessProbe: | ||
| {{- tpl (toYaml .) $ | nindent 12 }} | ||
| {{- end }} | ||
| {{- with .Values.resources }} | ||
| resources: | ||
| {{- toYaml . | nindent 12 }} | ||
| {{- end }} | ||
| {{- if .Values.deployment.enabled }} | ||
| {{- range $name, $values := .Values.extraContainers }} | ||
| - name: {{ $name }} | ||
| {{ toYaml $values | nindent 10 }} | ||
| {{- toYaml .Values.containerSecurityContext | nindent 8 }} | ||
| {{- with .Values.livenessProbe }} | ||
| livenessProbe: | ||
| {{- tpl (toYaml .) $ | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.readinessProbe }} | ||
| readinessProbe: | ||
| {{- tpl (toYaml .) $ | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.affinity }} | ||
| affinity: | ||
| {{- with .Values.resources }} | ||
| resources: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.nodeSelector }} | ||
| nodeSelector: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- if .Values.deployment.enabled }} | ||
| {{- range $name, $values := .Values.extraContainers }} | ||
| - name: {{ $name }} | ||
| {{ toYaml $values | nindent 6 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with .Values.affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- with .Values.nodeSelector }} | ||
| nodeSelector: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- with .Values.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| volumes: | ||
| - name: config | ||
| {{- if .Values.configmap.enabled }} | ||
| configMap: | ||
| name: {{ include "promtail.fullname" . }} | ||
| {{- else }} | ||
| secret: | ||
| secretName: {{ include "promtail.fullname" . }} | ||
| {{- end }} | ||
| {{- with .Values.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| volumes: | ||
| - name: config | ||
| {{- if .Values.configmap.enabled }} | ||
| configMap: | ||
| name: {{ include "promtail.fullname" . }} | ||
| {{- else }} | ||
| secret: | ||
| secretName: {{ include "promtail.fullname" . }} | ||
| {{- end }} | ||
| {{- with .Values.defaultVolumes }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.extraVolumes }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.defaultVolumes }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- with .Values.extraVolumes }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.