mirror of https://git.rancher.io/charts
(dev-v2.6-archive) Update rancher-pushprox to support overriding namespace and switching the workload type of the client between Deployment and DaemonSet by adding replicas and affinity in pod.spec
(partially cherry picked from commit 8bf9b82e91)
pull/1680/head
Jiaqi Luo
Arvind Iyengar
parent
63682d8921
commit
e45348b081
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc1/fleet-agent-0.3.6-rc1.tgz
|
||||
url: https://github.com/rancher/fleet/releases/download/v0.3.5/fleet-agent-0.3.5.tgz
|
||||
packageVersion: 0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc1/fleet-crd-0.3.6-rc1.tgz
|
||||
url: https://github.com/rancher/fleet/releases/download/v0.3.5/fleet-crd-0.3.5.tgz
|
||||
packageVersion: 0
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
url: https://github.com/rancher/fleet/releases/download/v0.3.6-rc1/fleet-0.3.6-rc1.tgz
|
||||
url: https://github.com/rancher/fleet/releases/download/v0.3.5/fleet-0.3.5.tgz
|
||||
packageVersion: 0
|
||||
|
||||
|
|
|
|||
|
|
@ -16,19 +16,19 @@ spec:
|
|||
Tag: "aks"
|
||||
Path: "/var/log/azure/kubelet-status.log"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentbit.bufferStorage }}
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ spec:
|
|||
Path: "/var/log/messages"
|
||||
Parser: "syslog"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentbit.bufferStorage }}
|
||||
|
|
|
|||
|
|
@ -16,19 +16,19 @@ spec:
|
|||
Tag: "gke"
|
||||
Path: "/var/log/kube-proxy.log"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentbit.bufferStorage }}
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "systemd") }}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-k3s
|
||||
labels:
|
||||
{{ include "logging-operator.labels" . | indent 4 }}
|
||||
data:
|
||||
fluent-bit.conf: |
|
||||
[SERVICE]
|
||||
Flush 1
|
||||
Grace 5
|
||||
Daemon Off
|
||||
Log_Level info
|
||||
Coro_Stack_Size 24576
|
||||
|
||||
[INPUT]
|
||||
Name systemd
|
||||
Tag k3s
|
||||
Path {{ .Values.systemdLogPath | default "/var/log/journal" }}
|
||||
Systemd_Filter _SYSTEMD_UNIT=k3s.service
|
||||
|
||||
[OUTPUT]
|
||||
Name forward
|
||||
Match *
|
||||
Host {{ .Release.Name }}-fluentd.{{ .Release.Namespace }}.svc
|
||||
Port 24240
|
||||
Retry_Limit False
|
||||
{{- end }}
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "systemd") }}
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
namespace: "{{ .Release.Namespace }}"
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
name: {{ .Release.Name }}-k3s-journald-aggregator
|
||||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
checksum/config: {{ include (print $.Template.BasePath "/loggings/k3s/configmap.yaml") . | sha256sum }}
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
namespace: "{{ .Release.Namespace }}"
|
||||
labels:
|
||||
name: {{ .Release.Name }}-k3s-journald-aggregator
|
||||
spec:
|
||||
containers:
|
||||
- name: fluentbit
|
||||
image: "{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}:{{ .Values.images.fluentbit.tag }}"
|
||||
{{- if .Values.global.seLinux.enabled }}
|
||||
securityContext:
|
||||
seLinuxOptions:
|
||||
type: rke_logreader_t
|
||||
{{- end }}
|
||||
volumeMounts:
|
||||
- mountPath: /fluent-bit/etc/
|
||||
name: config
|
||||
- mountPath: {{ .Values.systemdLogPath | default "/var/log/journal" }}
|
||||
name: journal
|
||||
readOnly: true
|
||||
- mountPath: /etc/machine-id
|
||||
name: machine-id
|
||||
readOnly: true
|
||||
{{- with .Values.tolerations }}
|
||||
tolerations: {{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector: {{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
volumes:
|
||||
- name: config
|
||||
configMap:
|
||||
name: "{{ .Release.Name }}-k3s"
|
||||
- name: journal
|
||||
hostPath:
|
||||
path: {{ .Values.systemdLogPath | default "/var/log/journal" }}
|
||||
- name: machine-id
|
||||
hostPath:
|
||||
path: /etc/machine-id
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
namespace: "{{ .Release.Namespace }}"
|
||||
{{- if .Values.global.psp.enabled }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
rules:
|
||||
- apiGroups:
|
||||
- policy
|
||||
resourceNames:
|
||||
- "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
resources:
|
||||
- podsecuritypolicies
|
||||
verbs:
|
||||
- use
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
---
|
||||
apiVersion: policy/v1beta1
|
||||
kind: PodSecurityPolicy
|
||||
metadata:
|
||||
name: "{{ .Release.Name }}-k3s-journald-aggregator"
|
||||
namespace: "{{ .Release.Namespace }}"
|
||||
spec:
|
||||
allowPrivilegeEscalation: false
|
||||
fsGroup:
|
||||
rule: RunAsAny
|
||||
readOnlyRootFilesystem: true
|
||||
runAsUser:
|
||||
rule: RunAsAny
|
||||
seLinux:
|
||||
rule: RunAsAny
|
||||
supplementalGroups:
|
||||
rule: RunAsAny
|
||||
volumes:
|
||||
- configMap
|
||||
- emptyDir
|
||||
- secret
|
||||
- hostPath
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
@ -16,19 +16,19 @@ spec:
|
|||
Tag: "k3s"
|
||||
Path: "/var/log/k3s.log"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
extraVolumeMounts:
|
||||
- source: "/var/log/"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,93 @@
|
|||
{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "systemd")}}
|
||||
apiVersion: logging.banzaicloud.io/v1beta1
|
||||
kind: Logging
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-k3s
|
||||
namespace: {{ .Release.Namespace }}
|
||||
labels:
|
||||
{{ include "logging-operator.labels" . | indent 4 }}
|
||||
spec:
|
||||
controlNamespace: {{ .Release.Namespace }}
|
||||
fluentbit:
|
||||
image:
|
||||
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
|
||||
tag: {{ .Values.images.fluentbit.tag }}
|
||||
inputTail:
|
||||
Tag: "k3s"
|
||||
Path: "/var/log/syslog"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
extraVolumeMounts:
|
||||
- source: "/var/log/"
|
||||
destination: "/var/log"
|
||||
readOnly: true
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentbit.bufferStorage }}
|
||||
bufferStorage: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentbit.bufferStorageVolume }}
|
||||
bufferStorageVolume: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.global.psp.enabled }}
|
||||
security:
|
||||
podSecurityPolicyCreate: true
|
||||
roleBasedAccessControlCreate: true
|
||||
{{- end }}
|
||||
{{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations)) }}
|
||||
tolerations: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentbit.resources }}
|
||||
resources: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
fluentd:
|
||||
image:
|
||||
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
|
||||
tag: {{ .Values.images.fluentd.tag }}
|
||||
configReloaderImage:
|
||||
repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
|
||||
tag: {{ .Values.images.config_reloader.tag }}
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentd.bufferStorageVolume }}
|
||||
bufferStorageVolume: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
disablePvc: {{ .Values.disablePvc }}
|
||||
{{- if .Values.fluentd.replicas }}
|
||||
scaling:
|
||||
replicas: {{ .Values.fluentd.replicas }}
|
||||
{{- end }}
|
||||
{{- if .Values.global.psp.enabled }}
|
||||
security:
|
||||
podSecurityPolicyCreate: true
|
||||
roleBasedAccessControlCreate: true
|
||||
{{- end }}
|
||||
{{- with (default .Values.tolerations .Values.fluentd.tolerations) }}
|
||||
tolerations: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with (default .Values.nodeSelector .Values.fluentd.nodeSelector) }}
|
||||
nodeSelector: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentd.resources }}
|
||||
resources: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentd.livenessProbe }}
|
||||
livenessProbe: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
@ -21,19 +21,19 @@ spec:
|
|||
Path: /kube-audit-logs/{{ template "kubeAuditFilename" . }}
|
||||
Parser: json
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
extraVolumeMounts:
|
||||
- source: {{ template "kubeAuditPathPrefix" . }}
|
||||
|
|
@ -95,4 +95,4 @@ spec:
|
|||
{{- with .Values.fluentd.livenessProbe }}
|
||||
livenessProbe: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
@ -7,19 +7,11 @@ metadata:
|
|||
{{ include "logging-operator.labels" . | indent 4 }}
|
||||
data:
|
||||
fluent-bit.conf: |
|
||||
[SERVICE]
|
||||
Flush 1
|
||||
Grace 5
|
||||
Daemon Off
|
||||
Log_Level info
|
||||
Coro_Stack_Size 24576
|
||||
|
||||
[INPUT]
|
||||
Name systemd
|
||||
Tag rke2
|
||||
Path {{ .Values.systemdLogPath | default "/var/log/journal" }}
|
||||
Systemd_Filter _SYSTEMD_UNIT=rke2-server.service
|
||||
Systemd_Filter _SYSTEMD_UNIT=rke2-agent.service
|
||||
|
||||
[OUTPUT]
|
||||
Name forward
|
||||
|
|
|
|||
|
|
@ -0,0 +1,98 @@
|
|||
{{- if .Values.additionalLoggingSources.rke2.enabled }}
|
||||
apiVersion: logging.banzaicloud.io/v1beta1
|
||||
kind: Logging
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-rke2-containers
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
controlNamespace: {{ .Release.Namespace }}
|
||||
fluentbit:
|
||||
image:
|
||||
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
|
||||
tag: {{ .Values.images.fluentbit.tag }}
|
||||
inputTail:
|
||||
Tag: "rke2"
|
||||
Path: "/var/log/containers/*rke*.log"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
extraVolumeMounts:
|
||||
- source: "/var/log/containers/"
|
||||
destination: "/var/log/containers/"
|
||||
readOnly: true
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentbit.bufferStorage }}
|
||||
bufferStorage: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentbit.bufferStorageVolume }}
|
||||
bufferStorageVolume: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if or .Values.global.psp.enabled .Values.global.seLinux.enabled }}
|
||||
security:
|
||||
{{- end }}
|
||||
{{- if or .Values.global.psp.enabled }}
|
||||
podSecurityPolicyCreate: true
|
||||
roleBasedAccessControlCreate: true
|
||||
{{- end }}
|
||||
{{- if .Values.global.seLinux.enabled }}
|
||||
securityContext:
|
||||
seLinuxOptions:
|
||||
type: rke_logreader_t
|
||||
{{- end }}
|
||||
{{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations)) }}
|
||||
tolerations: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentbit.resources }}
|
||||
resources: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
fluentd:
|
||||
image:
|
||||
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
|
||||
tag: {{ .Values.images.fluentd.tag }}
|
||||
configReloaderImage:
|
||||
repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
|
||||
tag: {{ .Values.images.config_reloader.tag }}
|
||||
{{- if not .Values.disablePvc }}
|
||||
{{- with .Values.fluentd.bufferStorageVolume }}
|
||||
bufferStorageVolume: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
disablePvc: {{ .Values.disablePvc }}
|
||||
{{- if .Values.fluentd.replicas }}
|
||||
scaling:
|
||||
replicas: {{ .Values.fluentd.replicas }}
|
||||
{{- end }}
|
||||
{{- if .Values.global.psp.enabled }}
|
||||
security:
|
||||
podSecurityPolicyCreate: true
|
||||
roleBasedAccessControlCreate: true
|
||||
{{- end }}
|
||||
{{- with (default .Values.tolerations .Values.fluentd.tolerations) }}
|
||||
tolerations: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with (default .Values.nodeSelector .Values.fluentd.nodeSelector) }}
|
||||
nodeSelector: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentd.resources }}
|
||||
resources: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- with .Values.fluentd.livenessProbe }}
|
||||
livenessProbe: {{- toYaml . | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
@ -31,19 +31,19 @@ spec:
|
|||
inputTail:
|
||||
Path: "{{ template "windowsPathPrefix" . }}/var/lib/rancher/rke/log"
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
extraVolumeMounts:
|
||||
- source: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log"
|
||||
|
|
@ -67,19 +67,19 @@ spec:
|
|||
{{- if or .Values.fluentbit.inputTail.Buffer_Chunk_Size .Values.fluentbit.inputTail.Buffer_Max_Size .Values.fluentbit.inputTail.Mem_Buf_Limit .Values.fluentbit.inputTail.Multiline_Flush .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
inputTail:
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }}
|
||||
Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }}
|
||||
Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }}
|
||||
Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }}
|
||||
Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush }}
|
||||
{{- end }}
|
||||
{{- if .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }}
|
||||
Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if not .Values.disablePvc }}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
+++ charts/Chart.yaml
|
||||
@@ -1,5 +1,18 @@
|
||||
apiVersion: v1
|
||||
appVersion: 3.10.0
|
||||
appVersion: 3.9.4
|
||||
-description: A Helm chart to install Banzai Cloud logging-operator
|
||||
-name: logging-operator
|
||||
+description: Collects and filter logs using highly configurable CRDs. Powered by Banzai Cloud Logging Operator.
|
||||
+name: rancher-logging
|
||||
version: 3.10.0
|
||||
version: 3.9.4
|
||||
+icon: https://charts.rancher.io/assets/logos/logging.svg
|
||||
+keywords:
|
||||
+ - logging
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
image:
|
||||
- repository: ghcr.io/banzaicloud/logging-operator
|
||||
+ repository: rancher/mirrored-banzaicloud-logging-operator
|
||||
tag: 3.10.0
|
||||
tag: 3.9.4
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
@@ -38,9 +38,14 @@
|
||||
@@ -37,9 +37,14 @@
|
||||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
affinity: {}
|
||||
|
||||
@@ -56,6 +61,9 @@
|
||||
@@ -55,6 +60,9 @@
|
||||
# Labels to query http service
|
||||
labels: {}
|
||||
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
rbac:
|
||||
enabled: true
|
||||
psp:
|
||||
@@ -95,3 +103,107 @@
|
||||
@@ -85,3 +93,107 @@
|
||||
additionalLabels: {}
|
||||
metricRelabelings: []
|
||||
relabelings: []
|
||||
|
|
@ -82,17 +82,17 @@
|
|||
+ tag: v0.4.0
|
||||
+ fluentbit:
|
||||
+ repository: rancher/mirrored-fluent-fluent-bit
|
||||
+ tag: 1.7.4
|
||||
+ tag: 1.6.10
|
||||
+ fluentbit_debug:
|
||||
+ repository: rancher/mirrored-fluent-fluent-bit
|
||||
+ tag: 1.7.4-debug
|
||||
+ tag: 1.6.10-debug
|
||||
+ fluentd:
|
||||
+ repository: rancher/mirrored-banzaicloud-fluentd
|
||||
+ tag: v1.11.5-alpine-21
|
||||
+ tag: v1.11.5-alpine-12
|
||||
+ nodeagent_fluentbit:
|
||||
+ os: "windows,linux"
|
||||
+ repository: rancher/fluent-bit
|
||||
+ tag: 1.7.4
|
||||
+ tag: 1.6.10
|
||||
+
|
||||
+# These settings apply to every Logging CR, including vendor Logging CRs enabled in "additionalLoggingSources".
|
||||
+# Changing these affects every Logging CR installed.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.10.0.tgz
|
||||
url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.9.4.tgz
|
||||
packageVersion: 1
|
||||
additionalCharts:
|
||||
- workingDir: charts-crd
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ The following tables list the configurable parameters of the rancher-pushprox ch
|
|||
| ----- | ----------- | ------ |
|
||||
| `component` | The component that is being monitored | `kube-etcd`
|
||||
| `metricsPort` | The port on the host that contains the metrics you want to scrape (e.g. `http://<HOST_IP>:<metricsPort>/metrics`) | `2379` |
|
||||
| `namespaceOverride` | The namespace to install the chart | `""`
|
||||
|
||||
#### Optional
|
||||
| Parameter | Description | Default |
|
||||
|
|
@ -42,6 +43,9 @@ The following tables list the configurable parameters of the rancher-pushprox ch
|
|||
| `clients.https.keyFile` | The path to the TLS key file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
|
||||
| `clients.https.caCertFile` | The path to the TLS cacert file located within `clients.https.certDir`. Required and only used if `clients.https.enabled` is set | `""` |
|
||||
| `clients.rbac.additionalRules` | Additional permissions to provide to the ServiceAccount bound to the client. This can be used to provide additional permissions for the client to scrape metrics from the k8s API. Only enabled if clients.https.enabled and clients.https.useServiceAccountCredentials are true | `[]` |
|
||||
| `clients.deployment.enabled` | Deploys the client as a Deployment (generally used if the underlying hostNetwork Pod that is being scraped is managed by a Deployment) | `false` |
|
||||
| `clients.deployment.replicas` | The number of pods the Deployment has, it should match the number of pod the hostNetwork Deployment has. Required and only used if `client.deployment.enable` is set | `0` |
|
||||
| `clients.deployment.affinity` | The affinity rules that allocate the pod to the node in which the hostNetwork Deployment's pods run. Required and only used if `client.deployment.enable` is set | `{}` |
|
||||
| `clients.resources` | Set resource limits and requests for the client container | `{}` |
|
||||
| `clients.nodeSelector` | Select which nodes to deploy the clients on | `{}` |
|
||||
| `clients.tolerations` | Specify tolerations for clients | `[]` |
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ provider: kubernetes
|
|||
{{- if .Values.clients.proxyUrl -}}
|
||||
{{ printf "%s" .Values.clients.proxyUrl }}
|
||||
{{- else -}}
|
||||
{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) .Release.Namespace (int .Values.proxy.port) }}
|
||||
{{ printf "http://%s.%s.svc:%d" (include "pushProxy.proxy.name" .) (include "pushprox.namespace" .) (int .Values.proxy.port) }}
|
||||
{{- end -}}{{- end -}}
|
||||
|
||||
# Client
|
||||
|
|
|
|||
|
|
@ -30,20 +30,20 @@ roleRef:
|
|||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: {{ template "pushProxy.client.name" . }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
namespace: {{ include "pushprox.namespace" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ template "pushProxy.client.name" . }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
namespace: {{ include "pushprox.namespace" . }}
|
||||
labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
|
||||
---
|
||||
apiVersion: policy/v1beta1
|
||||
kind: PodSecurityPolicy
|
||||
metadata:
|
||||
name: {{ template "pushProxy.client.name" . }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
namespace: {{ include "pushprox.namespace" . }}
|
||||
labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
|
||||
spec:
|
||||
privileged: false
|
||||
|
|
|
|||
|
|
@ -1,18 +1,28 @@
|
|||
{{- if .Values.clients }}{{- if .Values.clients.enabled }}
|
||||
apiVersion: apps/v1
|
||||
{{- if .Values.clients.deployment.enabled }}
|
||||
kind: Deployment
|
||||
{{- else }}
|
||||
kind: DaemonSet
|
||||
{{- end }}
|
||||
metadata:
|
||||
name: {{ template "pushProxy.client.name" . }}
|
||||
namespace: {{ template "pushprox.namespace" . }}
|
||||
labels: {{ include "pushProxy.client.labels" . | nindent 4 }}
|
||||
pushprox-exporter: "client"
|
||||
spec:
|
||||
{{- if .Values.clients.deployment.enabled }}
|
||||
replicas: {{ .Values.clients.deployment.replicas }}
|
||||
{{- end }}
|
||||
selector:
|
||||
matchLabels: {{ include "pushProxy.client.labels" . | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
labels: {{ include "pushProxy.client.labels" . | nindent 8 }}
|
||||
spec:
|
||||
{{- if .Values.clients.affinity }}
|
||||
affinity: {{ toYaml .Values.clients.affinity | nindent 8 }}
|
||||
{{- end }}
|
||||
nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
|
||||
{{- if .Values.clients.nodeSelector }}
|
||||
{{ toYaml .Values.clients.nodeSelector | indent 8 }}
|
||||
|
|
|
|||
|
|
@ -23,20 +23,20 @@ roleRef:
|
|||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: {{ template "pushProxy.proxy.name" . }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
namespace: {{ include "pushprox.namespace" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ template "pushProxy.proxy.name" . }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
namespace: {{ include "pushprox.namespace" . }}
|
||||
labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }}
|
||||
---
|
||||
apiVersion: policy/v1beta1
|
||||
kind: PodSecurityPolicy
|
||||
metadata:
|
||||
name: {{ template "pushProxy.proxy.name" . }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
namespace: {{ include "pushprox.namespace" . }}
|
||||
labels: {{ include "pushProxy.proxy.labels" . | nindent 4 }}
|
||||
spec:
|
||||
privileged: false
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ global:
|
|||
cattle:
|
||||
systemDefaultRegistry: ""
|
||||
|
||||
namespaceOverride: ""
|
||||
|
||||
# The component that is being monitored (i.e. etcd)
|
||||
component: "component"
|
||||
|
||||
|
|
@ -69,6 +71,7 @@ clients:
|
|||
# Options to select all nodes to deploy client DaemonSet on
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
|
||||
image:
|
||||
repository: rancher/pushprox-client
|
||||
|
|
@ -79,6 +82,17 @@ clients:
|
|||
repository: rancher/mirrored-library-busybox
|
||||
tag: 1.31.1
|
||||
|
||||
# The default intention of rancher-pushprox clients is to scrape hostNetwork metrics across all nodes.
|
||||
# This can be used to scrape internal Kubernetes components or DaemonSets of hostNetwork Pods in
|
||||
# situations where a cloud provider firewall prevents Pod-To-Host communication but not Pod-To-Pod.
|
||||
# However, if the underlying hostNetwork Pod that is being scraped is managed by a Deployment,
|
||||
# this advanced option enables users to deploy the client as a Deployment instead of a DaemonSet.
|
||||
# If a user deploys this feature and the underlying Deployment's number of replicas changes, the user will
|
||||
# be responsible for upgrading this chart accordingly to the right number of replicas.
|
||||
deployment:
|
||||
enabled: false
|
||||
replicas: 0
|
||||
|
||||
proxy:
|
||||
enabled: true
|
||||
# The port through which PushProx clients will communicate to the proxy
|
||||
|
|
|
|||
Loading…
Reference in New Issue