diff --git a/charts/logging-operator-logging/README.md b/charts/logging-operator-logging/README.md index 3892cf624..d55b56042 100644 --- a/charts/logging-operator-logging/README.md +++ b/charts/logging-operator-logging/README.md @@ -12,37 +12,37 @@ $ helm install banzaicloud-stable/logging-operator-logging The following tables lists the configurable parameters of the logging-operator-logging chart and their default values. -| Parameter | Description | Default | -| --------------------------------------------------- | ------------------------------------------------------ |-----------------------------------------------------------| -| `enableRecreateWorkloadOnImmutableFieldChange` | Permit deletion and recreation of resources on update of immutable field | false | -| `tls.enabled` | Enabled TLS communication between components | true | +| Parameter | Description | Default | +| --------------------------------------------------- | ------------------------------------------------------ |------------------------------------------------------------| +| `enableRecreateWorkloadOnImmutableFieldChange` | Permit deletion and recreation of resources on update of immutable field | false | +| `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.tolerations` | Tolerations for fluentbit daemonset | none | -| `fluentbit.image.tag` | Fluentbit container image tag | `1.8.12` | -| `fluentbit.image.repository` | Fluentbit container image repository | `fluent/fluent-bit` | -| `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` | -| `fluentbit.podPriorityClassName` | Priority class name for fluentbit pods | none | -| `fluentd.enabled` | Install fluentd | true | -| `fluentd.image.tag` | Fluentd container image tag | `v1.14.4-alpine-2` | -| `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.resources.storageClassName` | Fluentd persistence volume storageclass | `""` | -| `fluentd.tolerations` | Tolerations for fluentd statefulset | none | -| `fluentd.nodeSelector` | Node selector for fluentd pods | none | -| `fluentd.podPriorityClassName` | Priority class name for fluentd pods | none | -| `nodeAgents` | Node agents definitions | {}} | -| `defaultFlow` | Default Flow | {} | -| `clusterFlows` | Array of ClusterFlows to be created | [] | -| `clusterOutputs` | Array of ClusterOutputs to be created | [] | +| `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.tolerations` | Tolerations for fluentbit daemonset | none | +| `fluentbit.image.tag` | Fluentbit container image tag | `1.8.12` | +| `fluentbit.image.repository` | Fluentbit container image repository | `fluent/fluent-bit` | +| `fluentbit.image.pullPolicy` | Fluentbit container pull policy | `IfNotPresent` | +| `fluentbit.podPriorityClassName` | Priority class name for fluentbit pods | none | +| `fluentd.enabled` | Install fluentd | true | +| `fluentd.image.tag` | Fluentd container image tag | `v1.14.5-alpine-1` | +| `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.resources.storageClassName` | Fluentd persistence volume storageclass | `""` | +| `fluentd.tolerations` | Tolerations for fluentd statefulset | none | +| `fluentd.nodeSelector` | Node selector for fluentd pods | none | +| `fluentd.podPriorityClassName` | Priority class name for fluentd pods | none | +| `nodeAgents` | Node agents definitions | {}} | +| `defaultFlow` | Default Flow | {} | +| `clusterFlows` | Array of ClusterFlows to be created | [] | +| `clusterOutputs` | Array of ClusterOutputs to be created | [] | diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md index e0728e3d7..ec9e4d3d0 100644 --- a/charts/logging-operator/README.md +++ b/charts/logging-operator/README.md @@ -104,27 +104,27 @@ $ helm install banzaicloud-stable/logging-operator-logging 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 | +| 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.8.12` | -| `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.14.4-alpine-2` | -| `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 | `"""` | +| `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.8.12` | +| `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.14.5-alpine-1` | +| `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/fluentd-image/v1.14/Dockerfile b/fluentd-image/v1.14/Dockerfile index f7c49aad1..483ebf073 100644 --- a/fluentd-image/v1.14/Dockerfile +++ b/fluentd-image/v1.14/Dockerfile @@ -27,7 +27,7 @@ RUN apk update \ && gem install json -v 2.5.1 \ && gem install async-http -v 0.56.3 \ && gem install ext_monitor -v 0.1.2 \ - && gem install fluentd -v 1.14.4 \ + && gem install fluentd -v 1.14.5 \ && gem install prometheus-client -v 2.1.0 \ && gem install bigdecimal -v 1.4.4 \ && gem install webrick \ diff --git a/pkg/sdk/logging/api/v1beta1/logging_types.go b/pkg/sdk/logging/api/v1beta1/logging_types.go index ace510d81..4622b2fe3 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -116,7 +116,7 @@ const ( DefaultFluentbitImageRepository = "fluent/fluent-bit" DefaultFluentbitImageTag = "1.8.12" DefaultFluentdImageRepository = "ghcr.io/banzaicloud/fluentd" - DefaultFluentdImageTag = "v1.14.4-alpine-2" + DefaultFluentdImageTag = "v1.14.5-alpine-1" DefaultFluentdBufferStorageVolumeName = "fluentd-buffer" DefaultFluentdDrainWatchImageRepository = "ghcr.io/banzaicloud/fluentd-drain-watch" DefaultFluentdDrainWatchImageTag = "v0.0.1"