diff --git a/e2e/charts/logging-operator-logging/Chart.yaml b/e2e/charts/logging-operator-logging/Chart.yaml index ba574bedb..69505d9c1 100644 --- a/e2e/charts/logging-operator-logging/Chart.yaml +++ b/e2e/charts/logging-operator-logging/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 type: application name: logging-operator-logging -version: 4.2.0 -kubeVersion: ">=1.22" +version: 4.2.2 +kubeVersion: ">=1.22.0-0" description: A Helm chart to configure logging resource for the Logging operator. keywords: - logging @@ -24,7 +24,7 @@ annotations: - name: syslog-ng image: ghcr.io/axoflow/axosyslog:4.2.0 - name: logging-operator - image: ghcr.io/kube-logging/logging-operator:4.2.0 + image: ghcr.io/kube-logging/logging-operator:4.2.1 - name: config-reloader image: ghcr.io/kube-logging/config-reloader:v0.0.5 - name: node-exporter diff --git a/e2e/charts/logging-operator/Chart.yaml b/e2e/charts/logging-operator/Chart.yaml index b2ce5e6fc..6814d9eec 100644 --- a/e2e/charts/logging-operator/Chart.yaml +++ b/e2e/charts/logging-operator/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 type: application name: logging-operator -version: 4.2.1 -appVersion: 4.2.0 -kubeVersion: ">=1.22" +version: 4.2.3 +appVersion: 4.2.2 +kubeVersion: ">=1.22.0-0" description: Logging operator for Kubernetes based on Fluentd and Fluentbit. keywords: - logging @@ -19,4 +19,4 @@ annotations: description: Moved to to location artifacthub.io/images: | - name: logging-operator - image: ghcr.io/kube-logging/logging-operator:4.2.0 + image: ghcr.io/kube-logging/logging-operator:4.2.1 diff --git a/pkg/resources/fluentbit/config.go b/pkg/resources/fluentbit/config.go index 652cd1e7f..e65de00fd 100644 --- a/pkg/resources/fluentbit/config.go +++ b/pkg/resources/fluentbit/config.go @@ -100,7 +100,7 @@ var fluentBitConfigTemplate = ` Name forward Match * {{- if .Upstream.Enabled }} - Upstream upstream.conf + Upstream {{ .Upstream.Config.Path }} {{- else }} Host {{ .TargetHost }} Port {{ .TargetPort }} diff --git a/pkg/resources/fluentbit/configsecret.go b/pkg/resources/fluentbit/configsecret.go index 1314ef5d8..a587a500e 100644 --- a/pkg/resources/fluentbit/configsecret.go +++ b/pkg/resources/fluentbit/configsecret.go @@ -46,6 +46,7 @@ type upstreamNode struct { type upstream struct { Name string + Path string Nodes []upstreamNode } @@ -323,6 +324,7 @@ func (r *Reconciler) configSecret() (runtime.Object, reconciler.DesiredState, er if r.fluentbitSpec.EnableUpstream { input.FluentForwardOutput.Upstream.Enabled = true + input.FluentForwardOutput.Upstream.Config.Path = fmt.Sprintf("%s/%s", OperatorConfigPath, UpstreamConfigName) input.FluentForwardOutput.Upstream.Config.Name = "fluentd-upstream" for i := int32(0); i < utils.PointerToInt32(aggregatorReplicas); i++ { input.FluentForwardOutput.Upstream.Config.Nodes = append(input.FluentForwardOutput.Upstream.Config.Nodes, r.generateUpstreamNode(i)) diff --git a/pkg/resources/fluentbit/daemonset.go b/pkg/resources/fluentbit/daemonset.go index 18ef9f204..1bfd2d833 100644 --- a/pkg/resources/fluentbit/daemonset.go +++ b/pkg/resources/fluentbit/daemonset.go @@ -221,12 +221,6 @@ func (r *Reconciler) generateVolume() (v []corev1.Volume) { }, }, } - if r.fluentbitSpec.EnableUpstream { - volume.VolumeSource.Secret.Items = append(volume.VolumeSource.Secret.Items, corev1.KeyToPath{ - Key: UpstreamConfigName, - Path: UpstreamConfigName, - }) - } v = append(v, volume) } else { v = append(v, corev1.Volume{