diff --git a/charts/logging-demo/Chart.yaml b/charts/logging-demo/Chart.yaml index 353662774..d638c4dda 100644 --- a/charts/logging-demo/Chart.yaml +++ b/charts/logging-demo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "3.6.0" +appVersion: "3.7.0" description: A Helm chart for Kubernetes name: logging-demo -version: 3.6.0 +version: 3.7.0 icon: https://raw.githubusercontent.com/banzaicloud/logging-operator/master/docs/img/icon.png diff --git a/charts/logging-operator-logging/Chart.yaml b/charts/logging-operator-logging/Chart.yaml index 4f488297d..802cef93b 100644 --- a/charts/logging-operator-logging/Chart.yaml +++ b/charts/logging-operator-logging/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "3.6.0" +appVersion: "3.7.0" description: A Helm chart to configure logging resource for the Logging operator name: logging-operator-logging -version: 3.6.0 +version: 3.7.0 icon: https://raw.githubusercontent.com/banzaicloud/logging-operator/master/docs/img/icon.png diff --git a/charts/logging-operator-logging/README.md b/charts/logging-operator-logging/README.md index 60b879935..c8d459282 100644 --- a/charts/logging-operator-logging/README.md +++ b/charts/logging-operator-logging/README.md @@ -22,13 +22,13 @@ The following tables lists the configurable parameters of the logging-operator-l | `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.5.4` | +| `fluentbit.image.tag` | Fluentbit container image tag | `1.6.1` | | `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.11.4-alpine-1` | -| `fluentd.image.repository` | Fluentd container image repository | `banzaicloud/fluentd` | +| `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` | diff --git a/charts/logging-operator/Chart.yaml b/charts/logging-operator/Chart.yaml index 672fde22f..de7707be3 100644 --- a/charts/logging-operator/Chart.yaml +++ b/charts/logging-operator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: "3.6.0" +appVersion: "3.7.0" description: A Helm chart to install Banzai Cloud logging-operator name: logging-operator -version: 3.6.1 +version: 3.7.0 diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md index c66763802..e497cd94d 100644 --- a/charts/logging-operator/README.md +++ b/charts/logging-operator/README.md @@ -111,12 +111,12 @@ The following tables lists the configurable parameters of the logging-operator-l | `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.5.4` | +| `fluentbit.image.tag` | Fluentbit container image tag | `1.6.1` | | `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.4-alpine-1` | -| `fluentd.image.repository` | Fluentd container image repository | `banzaicloud/fluentd` | +| `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` | diff --git a/config/samples/logging_v1alpha2_logging_debug.yaml b/config/samples/logging_v1alpha2_logging_debug.yaml index d083d9f1e..daed6508d 100644 --- a/config/samples/logging_v1alpha2_logging_debug.yaml +++ b/config/samples/logging_v1alpha2_logging_debug.yaml @@ -8,7 +8,7 @@ spec: disablePvc: true fluentbit: image: - tag: 1.5.4-debug + tag: 1.6.1-debug repository: fluent/fluent-bit pullPolicy: IfNotPresent controlNamespace: default diff --git a/pkg/sdk/api/v1beta1/logging_types.go b/pkg/sdk/api/v1beta1/logging_types.go index a067141a3..271dca06b 100644 --- a/pkg/sdk/api/v1beta1/logging_types.go +++ b/pkg/sdk/api/v1beta1/logging_types.go @@ -109,7 +109,7 @@ func (l *Logging) SetDefaults() (*Logging, error) { return nil, errors.New("`fluentdPvcSpec` field is deprecated, use: `bufferStorageVolume`") } if copy.Spec.FluentdSpec.Image.Repository == "" { - copy.Spec.FluentdSpec.Image.Repository = "banzaicloud/fluentd" + copy.Spec.FluentdSpec.Image.Repository = "ghcr.io/banzaicloud/fluentd" } if copy.Spec.FluentdSpec.Image.Tag == "" { copy.Spec.FluentdSpec.Image.Tag = "v1.11.4-alpine-1" @@ -268,7 +268,7 @@ func (l *Logging) SetDefaults() (*Logging, error) { copy.Spec.FluentbitSpec.Image.Repository = "fluent/fluent-bit" } if copy.Spec.FluentbitSpec.Image.Tag == "" { - copy.Spec.FluentbitSpec.Image.Tag = "1.5.4" + copy.Spec.FluentbitSpec.Image.Tag = "1.6.1" } if copy.Spec.FluentbitSpec.Image.PullPolicy == "" { copy.Spec.FluentbitSpec.Image.PullPolicy = "IfNotPresent" diff --git a/pkg/sdk/resourcebuilder/component.go b/pkg/sdk/resourcebuilder/component.go index 92a4fa0a7..2b9504b9f 100644 --- a/pkg/sdk/resourcebuilder/component.go +++ b/pkg/sdk/resourcebuilder/component.go @@ -38,7 +38,7 @@ import ( ) const ( - Image = "ghcr.io/banzaicloud/logging-operator:3.6.0" + Image = "ghcr.io/banzaicloud/logging-operator:3.7.0" defaultNamespace = "logging-system" )