From d2615ae54793435bfd0189f4da6d8a11dec7a949 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 12 Jun 2024 10:25:37 -0400 Subject: [PATCH] Update to fluentbit:3.0.7. Signed-off-by: Josh Baird --- charts/fluent-operator/values.yaml | 8 ++++---- cmd/fluent-watcher/fluentbit/Dockerfile | 2 +- cmd/fluent-watcher/fluentbit/Dockerfile.debug | 2 +- config/samples/fluentbit_v1alpha2_fluentbit.yaml | 2 +- .../deploy/fluentbit-fluentBit.yaml | 2 +- manifests/kubeedge/fluentbit-fluentbit-edge.yaml | 2 +- manifests/logging-stack/fluentbit-fluentBit.yaml | 2 +- manifests/quick-start/fluentbit.yaml | 2 +- manifests/regex-parser/fluentbit-fluentBit.yaml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml index 904c61a0e..e47eaddad 100644 --- a/charts/fluent-operator/values.yaml +++ b/charts/fluent-operator/values.yaml @@ -74,8 +74,8 @@ fluentbit: enable: true serviceMonitor: false image: - repository: "kubesphere/fluent-bit" - tag: "v3.0.4" + repository: "ghcr.io/fluent/fluent-operator/fluentbit" + tag: "v3.0.7" # fluentbit resources. If you do want to specify resources, adjust them as necessary # You can adjust it based on the log volume. resources: @@ -371,8 +371,8 @@ fluentd: mode: "collector" port: 24224 image: - repository: "kubesphere/fluentd" - tag: "v1.15.3" + repository: "ghcr.io/fluent/fluent-operator/fluentd" + tag: "v1.17.0" # Numbers of the Fluentd instance # Applicable when the mode is "collector", and will be ignored when the mode is "agent" replicas: 1 diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile index 21ecd87d3..72335516f 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile +++ b/cmd/fluent-watcher/fluentbit/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /code RUN echo $(ls -al /code) RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go -FROM fluent/fluent-bit:3.0.4 +FROM fluent/fluent-bit:3.0.7 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/ diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug index f0609a446..94f335033 100644 --- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug +++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug @@ -6,7 +6,7 @@ WORKDIR /code RUN echo $(ls -al /code) RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go -FROM fluent/fluent-bit:3.0.4-debug +FROM fluent/fluent-bit:3.0.7-debug LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0" COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/ diff --git a/config/samples/fluentbit_v1alpha2_fluentbit.yaml b/config/samples/fluentbit_v1alpha2_fluentbit.yaml index b8b85b3da..c4e40206f 100644 --- a/config/samples/fluentbit_v1alpha2_fluentbit.yaml +++ b/config/samples/fluentbit_v1alpha2_fluentbit.yaml @@ -5,7 +5,7 @@ metadata: labels: app: fluent-bit spec: - image: kubesphere/fluent-bit:v3.0.4 + image: ghcr.io/fluent/fluent-operator/fluentbit:3.0.7 imagePullPolicy: IfNotPresent positionDB: hostPath: diff --git a/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml b/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml index c7b2171d9..74bfaf6d1 100644 --- a/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml +++ b/docs/best-practice/forwarding-logs-via-http/deploy/fluentbit-fluentBit.yaml @@ -5,7 +5,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v3.0.4 + image: ghcr.io/fluent/fluent-operator/fluentbit:3.0.7 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml index 213507f26..48fbcdc38 100644 --- a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml +++ b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v3.0.4 + image: ghcr.io/fluent/fluent-operator/fluentbit:3.0.7 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml index 4986a2530..3e1efb4a9 100644 --- a/manifests/logging-stack/fluentbit-fluentBit.yaml +++ b/manifests/logging-stack/fluentbit-fluentBit.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v3.0.4 + image: ghcr.io/fluent/fluent-operator/fluentbit:3.0.7 positionDB: hostPath: path: /var/lib/fluent-bit/ diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml index d500e7f68..cdd7fcc62 100644 --- a/manifests/quick-start/fluentbit.yaml +++ b/manifests/quick-start/fluentbit.yaml @@ -6,7 +6,7 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v3.0.4 + image: ghcr.io/fluent/fluent-operator/fluentbit:3.0.7 fluentBitConfigName: fluent-bit-config --- diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml index 855733a52..ee9c12dab 100644 --- a/manifests/regex-parser/fluentbit-fluentBit.yaml +++ b/manifests/regex-parser/fluentbit-fluentBit.yaml @@ -6,5 +6,5 @@ metadata: labels: app.kubernetes.io/name: fluent-bit spec: - image: kubesphere/fluent-bit:v3.0.4 + image: ghcr.io/fluent/fluent-operator/fluentbit:3.0.7 fluentBitConfigName: fluent-bit-config