From c320d24d5026e9807e1a0db3201b976fe7b5fcbe Mon Sep 17 00:00:00 2001 From: Nick Gerace Date: Wed, 9 Jun 2021 12:30:49 -0400 Subject: [PATCH] Fix logging 3.10.0 and remove bad chart --- .../rancher-logging-3.10.1+up3.10.0.tgz | Bin 11630 -> 0 bytes .../3.10.1+up3.10.0/.helmignore | 22 -- .../3.10.1+up3.10.0/Chart.yaml | 19 -- .../rancher-logging/3.10.1+up3.10.0/README.md | 131 ----------- .../3.10.1+up3.10.0/app-readme.md | 22 -- .../3.10.1+up3.10.0/templates/NOTES.txt | 0 .../3.10.1+up3.10.0/templates/_helpers.tpl | 123 ----------- .../templates/clusterrole.yaml | 173 --------------- .../templates/clusterrolebinding.yaml | 18 -- .../3.10.1+up3.10.0/templates/crds.yaml | 6 - .../3.10.1+up3.10.0/templates/deployment.yaml | 68 ------ .../templates/loggings/aks/logging.yaml | 89 -------- .../templates/loggings/eks/logging.yaml | 90 -------- .../templates/loggings/gke/logging.yaml | 89 -------- .../templates/loggings/k3s/configmap.yaml | 29 --- .../templates/loggings/k3s/daemonset.yaml | 110 --------- .../loggings/k3s/logging-k3s-openrc.yaml | 93 -------- .../loggings/kube-audit/logging.yaml | 98 -------- .../templates/loggings/rke/configmap.yaml | 29 --- .../templates/loggings/rke/daemonset.yaml | 122 ---------- .../templates/loggings/rke2/configmap.yaml | 30 --- .../templates/loggings/rke2/daemonset.yaml | 108 --------- .../templates/loggings/root/logging.yaml | 154 ------------- .../3.10.1+up3.10.0/templates/psp.yaml | 34 --- .../3.10.1+up3.10.0/templates/service.yaml | 20 -- .../templates/serviceMonitor.yaml | 30 --- .../templates/serviceaccount.yaml | 10 - .../3.10.1+up3.10.0/templates/userroles.yaml | 35 --- .../templates/validate-install-crd.yaml | 18 -- .../templates/validate-install.yaml | 5 - .../3.10.1+up3.10.0/values.yaml | 209 ------------------ index.yaml | 23 -- packages/rancher-logging/package.yaml | 2 +- .../templates/crd-template/Chart.yaml | 2 +- 34 files changed, 2 insertions(+), 2009 deletions(-) delete mode 100644 assets/rancher-logging/rancher-logging-3.10.1+up3.10.0.tgz delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/.helmignore delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/Chart.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/README.md delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/app-readme.md delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/NOTES.txt delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/_helpers.tpl delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrole.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrolebinding.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/crds.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/deployment.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/aks/logging.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/eks/logging.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/gke/logging.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/configmap.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/daemonset.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/logging-k3s-openrc.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/kube-audit/logging.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/configmap.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/daemonset.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/configmap.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/daemonset.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/root/logging.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/psp.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/service.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceMonitor.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceaccount.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/userroles.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install-crd.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install.yaml delete mode 100644 charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/values.yaml diff --git a/assets/rancher-logging/rancher-logging-3.10.1+up3.10.0.tgz b/assets/rancher-logging/rancher-logging-3.10.1+up3.10.0.tgz deleted file mode 100644 index 2a82f754c54c2f76472368712bd38c211e05c520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11630 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 **Tip**: You can use the default [values.yaml](values.yaml) - -## Installing Fluentd and Fluent-bit via logging - -The previous chart does **not** install `logging` resource to deploy Fluentd and Fluent-bit on cluster. To install them please use the [Logging Operator Logging](https://github.com/banzaicloud/logging-operator/tree/master/charts/logging-operator-logging) chart. - -## tl;dr: - -```bash -$ helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com -$ helm repo update -$ helm install banzaicloud-stable/logging-operator-logging -``` - -## Configuration - -The following tables lists the configurable parameters of the logging-operator-logging chart and their default values. -## tl;dr: - -```bash -$ helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com -$ helm repo update -$ helm install banzaicloud-stable/logging-operator-logging -``` - -## Configuration - -The following tables lists the configurable parameters of the logging-operator-logging chart and their default values. - -| Parameter | Description | Default | -| --------------------------------------------------- | ------------------------------------------------------ | ------------------------------ | -| `tls.enabled` | Enabled TLS communication between components | true | -| `tls.fluentdSecretName` | Specified secret name, which contain tls certs | This will overwrite automatic Helm certificate generation. | -| `tls.fluentbitSecretName` | Specified secret name, which contain tls certs | This will overwrite automatic Helm certificate generation. | -| `tls.sharedKey` | Shared key between nodes (fluentd-fluentbit) | [autogenerated] | -| `fluentbit.enabled` | Install fluent-bit | true | -| `fluentbit.namespace` | Specified fluentbit installation namespace | same as operator namespace | -| `fluentbit.image.tag` | Fluentbit container image tag | `1.7.4` | -| `fluentbit.image.repository` | Fluentbit container image repository | `fluent/fluent-bit` | -| `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` | -| `fluentd.enabled` | Install fluentd | true | -| `fluentd.image.tag` | Fluentd container image tag | `v1.11.5-alpine-21` | -| `fluentd.image.repository` | Fluentd container image repository | `ghcr.io/banzaicloud/fluentd` | -| `fluentd.image.pullPolicy` | Fluentd container pull policy | `IfNotPresent` | -| `fluentd.volumeModImage.tag` | Fluentd volumeModImage container image tag | `latest` | -| `fluentd.volumeModImage.repository` | Fluentd volumeModImage container image repository | `busybox` | -| `fluentd.volumeModImage.pullPolicy` | Fluentd volumeModImage container pull policy | `IfNotPresent` | -| `fluentd.configReloaderImage.tag` | Fluentd configReloaderImage container image tag | `v0.2.2` | -| `fluentd.configReloaderImage.repository` | Fluentd configReloaderImage container image repository | `jimmidyson/configmap-reload` | -| `fluentd.configReloaderImage.pullPolicy` | Fluentd configReloaderImage container pull policy | `IfNotPresent` | -| `fluentd.fluentdPvcSpec.accessModes` | Fluentd persistence volume access modes | `[ReadWriteOnce]` | -| `fluentd.fluentdPvcSpec.resources.requests.storage` | Fluentd persistence volume size | `21Gi` | -| `fluentd.fluentdPvcSpec.storageClassName` | Fluentd persistence volume storageclass | `"""` | diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/app-readme.md b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/app-readme.md deleted file mode 100644 index 2de4ab4c5..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/app-readme.md +++ /dev/null @@ -1,22 +0,0 @@ -# Rancher Logging - -This chart is based off of the upstream [Banzai Logging Operator](https://banzaicloud.com/docs/one-eye/logging-operator/) chart. The chart deploys a logging operator and CRDs, which allows users to configure complex logging pipelines with a few simple custom resources. There are two levels of logging, which allow you to collect all logs in a cluster or from a single namespace. - -For more information on how to use the feature, refer to our [docs](https://rancher.com/docs/rancher/v2.x/en/logging/v2.5/). - -## Namespace-level logging - -To collect logs from a single namespace, users create flows and these flows are connected to outputs or cluster outputs. - -## Cluster-level logging - -To collect logs from an entire cluster, users create cluster flows and cluster outputs. - -## CRDs - -- [Cluster Flow](https://banzaicloud.com/docs/one-eye/logging-operator/crds/v1beta1/clusterflow_types/) - A cluster flow is a CRD (`ClusterFlow`) that defines what logs to collect from the entire cluster. The cluster flow must be deployed in the same namespace as the logging operator. -- [Cluster Output](https://banzaicloud.com/docs/one-eye/logging-operator/crds/v1beta1/clusteroutput_types/) - A cluster output is a CRD (`ClusterOutput`) that defines how to connect to logging providers so they can start collecting logs. The cluster output must be deployed in the same namespace as the logging operator. The convenience of using a cluster output is that either a cluster flow or flow can send logs to those providers without needing to define specific outputs in each namespace for each flow. -- [Flow](https://banzaicloud.com/docs/one-eye/logging-operator/crds/v1beta1/flow_types/) - A flow is a CRD (`Flow`) that defines what logs to collect from the namespace that it is deployed in. -- [Output](https://banzaicloud.com/docs/one-eye/logging-operator/crds/v1beta1/output_types/) - An output is a CRD (`Output`) that defines how to connect to logging providers so logs can be sent to the provider. - -For more information on how to configure the Helm chart, refer to the Helm README. diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/NOTES.txt b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/NOTES.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/_helpers.tpl b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/_helpers.tpl deleted file mode 100644 index a8b86d9bd..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/_helpers.tpl +++ /dev/null @@ -1,123 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "logging-operator.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "logging-operator.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Provides the namespace the chart will be installed in using the builtin .Release.Namespace, -or, if provided, a manually overwritten namespace value. -*/}} -{{- define "logging-operator.namespace" -}} -{{- if .Values.namespaceOverride -}} -{{ .Values.namespaceOverride -}} -{{- else -}} -{{ .Release.Namespace }} -{{- end -}} -{{- end -}} - - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "logging-operator.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "logging-operator.labels" -}} -app.kubernetes.io/name: {{ include "logging-operator.name" . }} -helm.sh/chart: {{ include "logging-operator.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{- define "system_default_registry" -}} -{{- if .Values.global.cattle.systemDefaultRegistry -}} -{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}} -{{- else -}} -{{- "" -}} -{{- end -}} -{{- end -}} - -{{- define "windowsEnabled" }} -{{- if not (kindIs "invalid" .Values.global.cattle.windows) }} -{{- if not (kindIs "invalid" .Values.global.cattle.windows.enabled) }} -{{- if .Values.global.cattle.windows.enabled }} -true -{{- end }} -{{- end }} -{{- end }} -{{- end }} - -{{- define "windowsPathPrefix" -}} -{{- trimSuffix "/" (default "c:\\" .Values.global.cattle.rkeWindowsPathPrefix | replace "\\" "/" | replace "//" "/" | replace "c:" "C:") -}} -{{- end -}} - -{{- define "windowsKubernetesFilter" -}} -{{- printf "kubernetes.%s" ((include "windowsPathPrefix" .) | replace ":" "" | replace "/" ".") -}} -{{- end -}} - -{{- define "windowsInputTailMount" -}} -{{- (include "windowsPathPrefix" .) | replace "C:" "" -}} -{{- end -}} - -{{/* -Set the controlplane selector based on kubernetes distribution -*/}} -{{- define "controlplaneSelector" -}} -{{- $master := or .Values.additionalLoggingSources.rke2.enabled .Values.additionalLoggingSources.k3s.enabled -}} -{{- $defaultSelector := $master | ternary (dict "node-role.kubernetes.io/master" "true") (dict "node-role.kubernetes.io/controlplane" "true") -}} -{{ default $defaultSelector .Values.additionalLoggingSources.kubeAudit.nodeSelector | toYaml }} -{{- end -}} - -{{/* -Set kube-audit file path prefix based on distribution -*/}} -{{- define "kubeAuditPathPrefix" -}} -{{- if .Values.additionalLoggingSources.rke.enabled -}} -{{ default "/var/log/kube-audit" .Values.additionalLoggingSources.kubeAudit.pathPrefix }} -{{- else if .Values.additionalLoggingSources.rke2.enabled -}} -{{ default "/var/lib/rancher/rke2/server/logs" .Values.additionalLoggingSources.kubeAudit.pathPrefix }} -{{- else -}} -{{ required "Directory PathPrefix of the kube-audit location is required" .Values.additionalLoggingSources.kubeAudit.pathPrefix }} -{{- end -}} -{{- end -}} - -{{/* -Set kube-audit file name based on distribution -*/}} -{{- define "kubeAuditFilename" -}} -{{- if .Values.additionalLoggingSources.rke.enabled -}} -{{ default "audit-log.json" .Values.additionalLoggingSources.kubeAudit.auditFilename }} -{{- else if .Values.additionalLoggingSources.rke2.enabled -}} -{{ default "audit.log" .Values.additionalLoggingSources.kubeAudit.auditFilename }} -{{- else -}} -{{ required "Filename of the kube-audit log is required" .Values.additionalLoggingSources.kubeAudit.auditFilename }} -{{- end -}} -{{- end -}} \ No newline at end of file diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrole.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrole.yaml deleted file mode 100644 index 7f90ca2c8..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrole.yaml +++ /dev/null @@ -1,173 +0,0 @@ -{{- if .Values.rbac.enabled }} - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: {{ template "logging-operator.fullname" . }} -rules: -- apiGroups: - - "" - resources: - - configmaps - - secrets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - endpoints - - namespaces - - nodes - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - persistentvolumeclaims - - pods - - serviceaccounts - - services - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - - events.k8s.io - resources: - - events - verbs: - - create - - get - - list - - watch -- apiGroups: - - apps - resources: - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - apps - - extensions - resources: - - deployments - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - '*' -- apiGroups: - - extensions - - networking.k8s.io - resources: - - ingresses - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - extensions - - policy - resources: - - podsecuritypolicies - verbs: - - create - - delete - - get - - list - - patch - - update - - use - - watch -- apiGroups: - - logging.banzaicloud.io - resources: - - clusterflows - - clusteroutputs - - flows - - loggings - - outputs - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - logging.banzaicloud.io - resources: - - clusterflows/status - - clusteroutputs/status - - flows/status - - loggings/status - - outputs/status - verbs: - - get - - patch - - update -- apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterrolebindings - - clusterroles - - rolebindings - - roles - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrolebinding.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrolebinding.yaml deleted file mode 100644 index 89d17d094..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/clusterrolebinding.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.rbac.enabled }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ template "logging-operator.fullname" . }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -subjects: - - kind: ServiceAccount - name: {{ template "logging-operator.fullname" . }} - namespace: {{ include "logging-operator.namespace" . }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ template "logging-operator.fullname" . }} - - {{- end }} \ No newline at end of file diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/crds.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/crds.yaml deleted file mode 100644 index f573652d0..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/crds.yaml +++ /dev/null @@ -1,6 +0,0 @@ -{{- if .Values.createCustomResource -}} -{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }} -{{ $.Files.Get $path }} ---- -{{- end }} -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/deployment.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/deployment.yaml deleted file mode 100644 index 26d14cca2..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/deployment.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "logging-operator.fullname" . }} - namespace: {{ include "logging-operator.namespace" . }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "logging-operator.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "logging-operator.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - {{- with .Values.podLabels }} - {{ toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.annotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- if .Values.priorityClassName }} - priorityClassName: {{ .Values.priorityClassName }} - {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ .Chart.Name }} - image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}" - args: {{ range .Values.extraArgs }} - - {{ . -}} - {{ end }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - ports: - - name: http - containerPort: {{ .Values.http.port }} - - {{- if .Values.securityContext }} - securityContext: {{ toYaml .Values.securityContext | nindent 12 }} - {{- end }} - {{- if .Values.podSecurityContext }} - securityContext: {{ toYaml .Values.podSecurityContext | nindent 8 }} - {{- end }} - - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if .Values.rbac.enabled }} - serviceAccountName: {{ include "logging-operator.fullname" . }} - {{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/aks/logging.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/aks/logging.yaml deleted file mode 100644 index a29b4f8bc..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/aks/logging.yaml +++ /dev/null @@ -1,89 +0,0 @@ -{{- if .Values.additionalLoggingSources.aks.enabled }} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Logging -metadata: - name: {{ .Release.Name }}-aks - 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: "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 }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- end }} - {{- 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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/eks/logging.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/eks/logging.yaml deleted file mode 100644 index aa05cbff0..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/eks/logging.yaml +++ /dev/null @@ -1,90 +0,0 @@ -{{- if .Values.additionalLoggingSources.eks.enabled }} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Logging -metadata: - name: {{ .Release.Name }}-eks - 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: "eks" - Path: "/var/log/messages" - Parser: "syslog" - {{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }} - Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- end }} - {{- 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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/gke/logging.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/gke/logging.yaml deleted file mode 100644 index 55103ffa6..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/gke/logging.yaml +++ /dev/null @@ -1,89 +0,0 @@ -{{- if .Values.additionalLoggingSources.gke.enabled }} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Logging -metadata: - name: {{ .Release.Name }}-gke - 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: "gke" - Path: "/var/log/kube-proxy.log" - {{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }} - Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- end }} - {{- 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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/configmap.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/configmap.yaml deleted file mode 100644 index c4b214aa2..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/configmap.yaml +++ /dev/null @@ -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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/daemonset.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/daemonset.yaml deleted file mode 100644 index 6597949c1..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/daemonset.yaml +++ /dev/null @@ -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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/logging-k3s-openrc.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/logging-k3s-openrc.yaml deleted file mode 100644 index 05c9aab29..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/k3s/logging-k3s-openrc.yaml +++ /dev/null @@ -1,93 +0,0 @@ -{{- if and .Values.additionalLoggingSources.k3s.enabled (eq .Values.additionalLoggingSources.k3s.container_engine "openrc")}} -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/k3s.log" - {{- if .Values.fluentbit.inputTail.Buffer_Chunk_Size }} - Buffer_Chunk_Size: {{ .Values.fluentbit.inputTail.Buffer_Chunk_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- 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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/kube-audit/logging.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/kube-audit/logging.yaml deleted file mode 100644 index 3892d4d7a..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/kube-audit/logging.yaml +++ /dev/null @@ -1,98 +0,0 @@ -{{- if .Values.additionalLoggingSources.kubeAudit.enabled }} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Logging -metadata: - name: {{ .Release.Name }}-kube-audit - namespace: {{ .Release.Namespace }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -spec: - controlNamespace: {{ .Release.Namespace }} - {{- if .Values.additionalLoggingSources.kubeAudit.loggingRef }} - loggingRef: {{ .Values.additionalLoggingSources.kubeAudit.loggingRef }} - {{- end }} - fluentbit: - disableKubernetesFilter: true - image: - repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }} - tag: {{ .Values.images.fluentbit.tag }} - inputTail: - Tag: {{ .Values.additionalLoggingSources.kubeAudit.fluentbit.logTag }} - 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 }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- end }} - extraVolumeMounts: - - source: {{ template "kubeAuditPathPrefix" . }} - destination: "/kube-audit-logs" - 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.additionalLoggingSources.kubeAudit.fluentbit.tolerations)) }} - tolerations: - {{- toYaml . | nindent 6 }} - {{- end }} - nodeSelector: - {{- include "controlplaneSelector" . | nindent 6 }} - {{- 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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/configmap.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/configmap.yaml deleted file mode 100644 index ab91d93e2..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/configmap.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.additionalLoggingSources.rke.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-rke - labels: -{{ include "logging-operator.labels" . | indent 4 }} -data: - fluent-bit.conf: | - [SERVICE] - Log_Level {{ .Values.additionalLoggingSources.rke.fluentbit.log_level }} - Parsers_File parsers.conf - - [INPUT] - Tag rke - Name tail - Path_Key filename - Parser docker - DB /tail-db/tail-containers-state.db - Mem_Buf_Limit {{ .Values.additionalLoggingSources.rke.fluentbit.mem_buffer_limit }} - Path /var/lib/rancher/rke/log/*.log - - [OUTPUT] - Name forward - Match * - Host {{ .Release.Name }}-fluentd.{{ .Release.Namespace }}.svc - Port 24240 - Retry_Limit False -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/daemonset.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/daemonset.yaml deleted file mode 100644 index e08ee8559..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke/daemonset.yaml +++ /dev/null @@ -1,122 +0,0 @@ -{{- if .Values.additionalLoggingSources.rke.enabled }} -{{- $containers := printf "%s/containers/" (default "/var/lib/docker" .Values.global.dockerRootDirectory) }} -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: "{{ .Release.Name }}-rke-aggregator" - namespace: "{{ .Release.Namespace }}" -spec: - selector: - matchLabels: - name: {{ .Release.Name }}-rke-aggregator - template: - metadata: - name: "{{ .Release.Name }}-rke-aggregator" - namespace: "{{ .Release.Namespace }}" - labels: - name: {{ .Release.Name }}-rke-aggregator - spec: - containers: - - name: fluentbit - image: "{{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}:{{ .Values.images.fluentbit.tag }}" - volumeMounts: - - mountPath: /var/lib/rancher/rke/log/ - name: indir - - mountPath: {{ $containers }} - name: containers - - mountPath: /tail-db - name: positiondb - - mountPath: /fluent-bit/etc/fluent-bit.conf - name: config - subPath: fluent-bit.conf - {{- if .Values.global.seLinux.enabled }} - securityContext: - seLinuxOptions: - type: rke_logreader_t - {{- end }} - volumes: - - name: indir - hostPath: - path: /var/lib/rancher/rke/log/ - type: DirectoryOrCreate - - name: containers - hostPath: - path: {{ $containers }} - type: DirectoryOrCreate - - name: positiondb - emptyDir: {} - - name: config - configMap: - name: "{{ .Release.Name }}-rke" - serviceAccountName: "{{ .Release.Name }}-rke-aggregator" - {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit.tolerations) }} - {{- with $total_tolerations }} - tolerations: {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: {{- toYaml . | nindent 8 }} - {{- end }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: "{{ .Release.Name }}-rke-aggregator" - namespace: "{{ .Release.Namespace }}" -{{- if .Values.global.psp.enabled }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: "{{ .Release.Name }}-rke-aggregator" -rules: - - apiGroups: - - policy - resourceNames: - - "{{ .Release.Name }}-rke-aggregator" - resources: - - podsecuritypolicies - verbs: - - use ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: "{{ .Release.Name }}-rke-aggregator" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: "{{ .Release.Name }}-rke-aggregator" -subjects: - - kind: ServiceAccount - name: "{{ .Release.Name }}-rke-aggregator" ---- -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: "{{ .Release.Name }}-rke-aggregator" - namespace: "{{ .Release.Namespace }}" -spec: - allowPrivilegeEscalation: false - allowedHostPaths: - - pathPrefix: {{ $containers }} - readOnly: false - - pathPrefix: /var/lib/rancher/rke/log/ - readOnly: false - - pathPrefix: /var/lib/rancher/logging/ - readOnly: false - fsGroup: - rule: RunAsAny - readOnlyRootFilesystem: true - runAsUser: - rule: RunAsAny - seLinux: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - volumes: - - configMap - - emptyDir - - secret - - hostPath -{{- end }} -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/configmap.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/configmap.yaml deleted file mode 100644 index c2323af92..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/configmap.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{- if .Values.additionalLoggingSources.rke2.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ .Release.Name }}-rke2 - 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 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 - Match * - Host {{ .Release.Name }}-fluentd.{{ .Release.Namespace }}.svc - Port 24240 - Retry_Limit False -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/daemonset.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/daemonset.yaml deleted file mode 100644 index 6025e04b4..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/rke2/daemonset.yaml +++ /dev/null @@ -1,108 +0,0 @@ -{{- if .Values.additionalLoggingSources.rke2.enabled }} -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" - namespace: "{{ .Release.Namespace }}" -spec: - selector: - matchLabels: - name: {{ .Release.Name }}-rke2-journald-aggregator - template: - metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" - namespace: "{{ .Release.Namespace }}" - labels: - name: {{ .Release.Name }}-rke2-journald-aggregator - spec: - containers: - - name: fluentd - 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 }}-rke2-journald-aggregator" - volumes: - - name: config - configMap: - name: "{{ .Release.Name }}-rke2" - - 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 }}-rke2-journald-aggregator" - namespace: "{{ .Release.Namespace }}" -{{- if .Values.global.psp.enabled }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" -rules: - - apiGroups: - - policy - resourceNames: - - "{{ .Release.Name }}-rke2-journald-aggregator" - resources: - - podsecuritypolicies - verbs: - - use ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: "{{ .Release.Name }}-rke2-journald-aggregator" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: "{{ .Release.Name }}-rke2-journald-aggregator" -subjects: - - kind: ServiceAccount - name: "{{ .Release.Name }}-rke2-journald-aggregator" ---- -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: "{{ .Release.Name }}-rke2-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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/root/logging.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/root/logging.yaml deleted file mode 100644 index f4e0937e4..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/loggings/root/logging.yaml +++ /dev/null @@ -1,154 +0,0 @@ -{{- $containers := printf "%s/containers/" (default "/var/lib/docker" .Values.global.dockerRootDirectory) }} -apiVersion: logging.banzaicloud.io/v1beta1 -kind: Logging -metadata: - name: {{ .Release.Name }} - namespace: {{ .Release.Namespace }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -spec: - controlNamespace: {{ .Release.Namespace }} - {{- if (include "windowsEnabled" .) }} - nodeAgents: - - name: win-agent - profile: windows - nodeAgentFluentbit: - daemonSet: - spec: - template: - spec: - containers: - - image: "{{ template "system_default_registry" . }}{{ .Values.images.nodeagent_fluentbit.repository }}:{{ .Values.images.nodeagent_fluentbit.tag }}" - name: fluent-bit - tls: - enabled: {{ .Values.nodeAgents.tls.enabled | default false }} - {{- if .Values.additionalLoggingSources.rke.enabled }} - - name: win-agent-rke - profile: windows - nodeAgentFluentbit: - filterKubernetes: - Kube_Tag_Prefix: "{{ template "windowsKubernetesFilter" . }}.var.lib.rancher.rke.log." - 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 }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- end }} - extraVolumeMounts: - - source: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log" - destination: "{{ template "windowsInputTailMount" . }}/var/lib/rancher/rke/log" - readOnly: true - daemonSet: - spec: - template: - spec: - containers: - - image: "{{ template "system_default_registry" . }}{{ .Values.images.nodeagent_fluentbit.repository }}:{{ .Values.images.nodeagent_fluentbit.tag }}" - name: fluent-bit - tls: - enabled: {{ .Values.nodeAgents.tls.enabled | default false }} - {{- end }} - {{- end }} - fluentbit: - image: - repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }} - tag: {{ .Values.images.fluentbit.tag }} - {{- 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 }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Buffer_Max_Size }} - Buffer_Max_Size: {{ .Values.fluentbit.inputTail.Buffer_Max_Size | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Mem_Buf_Limit }} - Mem_Buf_Limit: {{ .Values.fluentbit.inputTail.Mem_Buf_Limit | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Multiline_Flush }} - Multiline_Flush: {{ .Values.fluentbit.inputTail.Multiline_Flush | toString }} - {{- end }} - {{- if .Values.fluentbit.inputTail.Skip_Long_Lines }} - Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString }} - {{- end }} - {{- end }} - {{- 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 .Values.global.psp.enabled }} - podSecurityPolicyCreate: true - roleBasedAccessControlCreate: true - {{- end }} - {{- if .Values.global.seLinux.enabled }} - securityContext: - seLinuxOptions: - type: rke_logreader_t - {{- end }} - {{- if .Values.global.dockerRootDirectory }} - mountPath: {{ $containers }} - extraVolumeMounts: - - source: {{ $containers }} - destination: {{ $containers }} - readOnly: 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 }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/psp.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/psp.yaml deleted file mode 100644 index 46b2071ef..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/psp.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{ if and .Values.rbac.enabled .Values.rbac.psp.enabled }} -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: psp.logging-operator - namespace: {{ include "logging-operator.namespace" . }} - annotations: -{{- if .Values.rbac.psp.annotations }} -{{ toYaml .Values.rbac.psp.annotations | indent 4 }} -{{- end }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -spec: - readOnlyRootFilesystem: true - privileged: false - allowPrivilegeEscalation: false - runAsUser: - rule: MustRunAsNonRoot - fsGroup: - rule: MustRunAs - ranges: - - min: 1 - max: 65535 - supplementalGroups: - rule: MustRunAs - ranges: - - min: 1 - max: 65535 - seLinux: - rule: RunAsAny - volumes: - - secret - - configMap -{{ end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/service.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/service.yaml deleted file mode 100644 index f419ae2c4..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/service.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "logging-operator.fullname" . }} - namespace: {{ include "logging-operator.namespace" . }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -spec: - type: ClusterIP - {{- with .Values.http.service.clusterIP }} - clusterIP: {{ . }} - {{- end }} - ports: - - port: {{ .Values.http.port }} - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "logging-operator.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceMonitor.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceMonitor.yaml deleted file mode 100644 index 1bb762cde..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceMonitor.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{ if .Values.monitoring.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "logging-operator.fullname" . }} - namespace: {{ include "logging-operator.namespace" . }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -{{- with .Values.monitoring.serviceMonitor.additionalLabels }} - {{- toYaml . | nindent 4 }} -{{- end }} -spec: - selector: - matchLabels: -{{ include "logging-operator.labels" . | indent 6 }} - endpoints: - - port: http - path: /metrics - {{- with .Values.monitoring.serviceMonitor.metricsRelabelings }} - metricRelabelings: - {{- toYaml . | nindent 6 }} - {{- end }} - {{- with .Values.monitoring.serviceMonitor.relabelings }} - relabelings: - {{- toYaml . | nindent 4 }} - {{- end }} - namespaceSelector: - matchNames: - - {{ include "logging-operator.namespace" . }} -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceaccount.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceaccount.yaml deleted file mode 100644 index cbb2a94b4..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/serviceaccount.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- if .Values.rbac.enabled }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "logging-operator.fullname" . }} - namespace: {{ include "logging-operator.namespace" . }} - labels: -{{ include "logging-operator.labels" . | indent 4 }} -{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/userroles.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/userroles.yaml deleted file mode 100644 index f4136b09a..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/userroles.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: "logging-admin" - labels: - rbac.authorization.k8s.io/aggregate-to-admin: "true" -rules: - - apiGroups: - - "logging.banzaicloud.io" - resources: - - flows - - outputs - verbs: - - "*" ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: "logging-view" - labels: - rbac.authorization.k8s.io/aggregate-to-admin: "true" - rbac.authorization.k8s.io/aggregate-to-view: "true" - rbac.authorization.k8s.io/aggregate-to-edit: "true" -rules: - - apiGroups: - - "logging.banzaicloud.io" - resources: - - flows - - outputs - - clusterflows - - clusteroutputs - verbs: - - get - - list - - watch diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install-crd.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install-crd.yaml deleted file mode 100644 index 66e8725e5..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install-crd.yaml +++ /dev/null @@ -1,18 +0,0 @@ -#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}} -# {{- $found := dict -}} -# {{- set $found "logging.banzaicloud.io/v1beta1/ClusterFlow" false -}} -# {{- set $found "logging.banzaicloud.io/v1beta1/ClusterOutput" false -}} -# {{- set $found "logging.banzaicloud.io/v1beta1/Flow" false -}} -# {{- set $found "logging.banzaicloud.io/v1beta1/Logging" false -}} -# {{- set $found "logging.banzaicloud.io/v1beta1/Output" false -}} -# {{- range .Capabilities.APIVersions -}} -# {{- if hasKey $found (toString .) -}} -# {{- set $found (toString .) true -}} -# {{- end -}} -# {{- end -}} -# {{- range $_, $exists := $found -}} -# {{- if (eq $exists false) -}} -# {{- required "Required CRDs are missing. Please install the corresponding CRD chart before installing this chart." "" -}} -# {{- end -}} -# {{- end -}} -#{{- end -}} \ No newline at end of file diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install.yaml deleted file mode 100644 index bd624cc4b..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/templates/validate-install.yaml +++ /dev/null @@ -1,5 +0,0 @@ -#{{- if .Values.global.dockerRootDirectory }} -#{{- if or (hasSuffix "/containers" .Values.global.dockerRootDirectory) (hasSuffix "/" .Values.global.dockerRootDirectory) }} -#{{- required "global.dockerRootDirectory must not end with suffix: '/' or '/containers'" "" -}} -#{{- end }} -#{{- end }} diff --git a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/values.yaml b/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/values.yaml deleted file mode 100644 index 46cd77f7e..000000000 --- a/charts/rancher-logging/rancher-logging/3.10.1+up3.10.0/values.yaml +++ /dev/null @@ -1,209 +0,0 @@ -# Default values for logging-operator. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: rancher/mirrored-banzaicloud-logging-operator - tag: 3.10.0 - pullPolicy: IfNotPresent - -extraArgs: - - -enable-leader-election=true -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" -namespaceOverride: "" - -## Pod custom labels -## -podLabels: {} - -annotations: {} - -## Deploy CRDs used by Logging Operator. -## -createCustomResource: false - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: - kubernetes.io/os: linux - -tolerations: - - key: cattle.io/os - operator: "Equal" - value: "linux" - effect: NoSchedule - -affinity: {} - -http: - # http listen port number - port: 8080 - # Service definition for query http service - service: - type: ClusterIP - clusterIP: None - # Annotations to query http service - annotations: {} - # Labels to query http service - labels: {} - -# These "rbac" settings match the upstream defaults. For only using psp in the overlay files, which -# include the default Logging CRs created, see the "global.psp" setting. To enable psp for the entire -# chart, enable both "rbac.psp" and "global.psp" (this may require further changes to the chart). -rbac: - enabled: true - psp: - enabled: true - annotations: - seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default,runtime/default' - seccomp.security.alpha.kubernetes.io/defaultProfileName: 'runtime/default' - ## Specify pod annotations - ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#apparmor - ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp - ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#sysctl - - - -## SecurityContext holds pod-level security attributes and common container settings. -## This defaults to non root user with uid 1000 and gid 2000. *v1.PodSecurityContext false -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ -## -podSecurityContext: {} -# runAsNonRoot: true -# runAsUser: 1000 -# fsGroup: 2000 -securityContext: {} -# allowPrivilegeEscalation: false -# readOnlyRootFilesystem: true - # capabilities: - # drop: ["ALL"] - -## Operator priorityClassName -## -priorityClassName: {} - -monitoring: - # Create a Prometheus Operator ServiceMonitor object - serviceMonitor: - enabled: false - additionalLabels: {} - metricRelabelings: [] - relabelings: [] - -disablePvc: true - -systemdLogPath: "/run/log/journal" - -additionalLoggingSources: - rke: - enabled: false - fluentbit: - log_level: "info" - mem_buffer_limit: "5MB" - rke2: - enabled: false - k3s: - enabled: false - container_engine: "systemd" - aks: - enabled: false - eks: - enabled: false - gke: - enabled: false - kubeAudit: - auditFilename: "" - enabled: false - pathPrefix: "" - fluentbit: - logTag: kube-audit - tolerations: - - key: node-role.kubernetes.io/controlplane - value: "true" - effect: NoSchedule - - key: node-role.kubernetes.io/etcd - value: "true" - effect: NoExecute - -images: - config_reloader: - repository: rancher/mirrored-jimmidyson-configmap-reload - tag: v0.4.0 - fluentbit: - repository: rancher/mirrored-fluent-fluent-bit - tag: 1.7.4 - fluentbit_debug: - repository: rancher/mirrored-fluent-fluent-bit - tag: 1.7.4-debug - fluentd: - repository: rancher/mirrored-banzaicloud-fluentd - tag: v1.11.5-alpine-21 - nodeagent_fluentbit: - os: "windows,linux" - repository: rancher/fluent-bit - tag: 1.7.4 - -# These settings apply to every Logging CR, including vendor Logging CRs enabled in "additionalLoggingSources". -# Changing these affects every Logging CR installed. -nodeAgents: - tls: - enabled: false -fluentd: - bufferStorageVolume: {} - livenessProbe: - tcpSocket: - port: 24240 - initialDelaySeconds: 30 - periodSeconds: 15 - nodeSelector: {} - resources: {} - tolerations: {} -fluentbit: - inputTail: - Buffer_Chunk_Size: "" - Buffer_Max_Size: "" - Mem_Buf_Limit: "" - Multiline_Flush: "" - Skip_Long_Lines: "" - resources: {} - tolerations: - - key: node-role.kubernetes.io/controlplane - value: "true" - effect: NoSchedule - - key: node-role.kubernetes.io/etcd - value: "true" - effect: NoExecute - -global: - cattle: - systemDefaultRegistry: "" - # Uncomment the below two lines to either enable or disable Windows logging. If this chart is - # installed via the Rancher UI, it will set this value to "true" if the cluster is a Windows - # cluster. In that scenario, if you would like to disable Windows logging on Windows clusters, - # set the value below to "false". - # windows: - # enabled: true - # Change the "dockerRootDirectory" if the default Docker directory has changed. - dockerRootDirectory: "" - # This psp setting differs from the upstream "rbac.psp" by only enabling psp settings for the - # overlay files, which include the Logging CRs created, whereas the upstream "rbac.psp" affects the - # logging operator. - psp: - enabled: true - rkeWindowsPathPrefix: "c:\\" - seLinux: - enabled: false diff --git a/index.yaml b/index.yaml index 8510638bd..457331836 100755 --- a/index.yaml +++ b/index.yaml @@ -2051,29 +2051,6 @@ entries: - assets/rancher-kube-state-metrics/rancher-kube-state-metrics-2.13.101+up2.13.1.tgz version: 2.13.101+up2.13.1 rancher-logging: - - annotations: - catalog.cattle.io/auto-install: rancher-logging-crd=match - catalog.cattle.io/certified: rancher - catalog.cattle.io/display-name: Logging - catalog.cattle.io/namespace: cattle-logging-system - catalog.cattle.io/provides-gvr: logging.banzaicloud.io.clusterflow/v1beta1 - catalog.cattle.io/release-name: rancher-logging - catalog.cattle.io/ui-component: logging - apiVersion: v1 - appVersion: 3.10.0 - created: "2021-06-08T17:49:52.227392-04:00" - description: Collects and filter logs using highly configurable CRDs. Powered - by Banzai Cloud Logging Operator. - digest: 637d0dfef8313bc23181656c8b6f46855e901b982ef0602efe6bb907f7c63762 - icon: https://charts.rancher.io/assets/logos/logging.svg - keywords: - - logging - - monitoring - - security - name: rancher-logging - urls: - - assets/rancher-logging/rancher-logging-3.10.1+up3.10.0.tgz - version: 3.10.1+up3.10.0 - annotations: catalog.cattle.io/auto-install: rancher-logging-crd=match catalog.cattle.io/certified: rancher diff --git a/packages/rancher-logging/package.yaml b/packages/rancher-logging/package.yaml index 7c417f8f0..65caffcda 100644 --- a/packages/rancher-logging/package.yaml +++ b/packages/rancher-logging/package.yaml @@ -1,5 +1,5 @@ url: https://kubernetes-charts.banzaicloud.com/charts/logging-operator-3.10.0.tgz -packageVersion: 1 +packageVersion: 0 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/packages/rancher-logging/templates/crd-template/Chart.yaml b/packages/rancher-logging/templates/crd-template/Chart.yaml index f40341a4c..a9aeb4be3 100644 --- a/packages/rancher-logging/templates/crd-template/Chart.yaml +++ b/packages/rancher-logging/templates/crd-template/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 3.9.4 +version: 3.10.0 description: Installs the CRDs for rancher-logging. name: rancher-logging-crd type: application