diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml index 6e3275f7d..1b4a1e56d 100644 --- a/.github/workflows/build-fd-image.yaml +++ b/.github/workflows/build-fd-image.yaml @@ -6,7 +6,7 @@ on: docker_tag_version: description: 'Fluentd image release version' required: true - default: '1.15.3' + default: '1.17.0' env: DOCKER_REPO: 'kubesphere' diff --git a/Makefile b/Makefile index 3a01e1860..9d474bdc5 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ VERSION?=$(shell cat VERSION | tr -d " \t\n\r") # Image URL to use all building/pushing image targets FB_IMG ?= kubesphere/fluent-bit:v3.0.4 FB_IMG_DEBUG ?= kubesphere/fluent-bit:v3.0.4-debug -FD_IMG ?= kubesphere/fluentd:v1.15.3 +FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 FO_IMG ?= kubesphere/fluent-operator:$(VERSION) -FD_IMG_BASE ?= kubesphere/fluentd:v1.15.3-arm64-base +FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base ARCH ?= arm64 diff --git a/apis/fluentd/v1alpha1/tests/tools.go b/apis/fluentd/v1alpha1/tests/tools.go index 5ce942547..bd2dd2cb9 100644 --- a/apis/fluentd/v1alpha1/tests/tools.go +++ b/apis/fluentd/v1alpha1/tests/tools.go @@ -55,7 +55,7 @@ spec: size: 10 autoIncrementKey: "id" replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" @@ -80,7 +80,7 @@ spec: includeConfig: true includeRetry: true replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" @@ -132,7 +132,7 @@ spec: - /var/log/foo.log - /var/log/bar replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" diff --git a/manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml b/manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml index 13c5032b9..a5aea8264 100644 --- a/manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml +++ b/manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml @@ -11,7 +11,7 @@ spec: bind: 0.0.0.0 port: 24224 replicas: 3 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" diff --git a/manifests/fluentd/fluentd-cluster-cfg-output-es.yaml b/manifests/fluentd/fluentd-cluster-cfg-output-es.yaml index c65ae8100..9e6a53174 100644 --- a/manifests/fluentd/fluentd-cluster-cfg-output-es.yaml +++ b/manifests/fluentd/fluentd-cluster-cfg-output-es.yaml @@ -11,7 +11,7 @@ spec: bind: 0.0.0.0 port: 24224 replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" diff --git a/manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml b/manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml index 98ef0ee0c..6bb69d592 100644 --- a/manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml +++ b/manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml @@ -11,7 +11,7 @@ spec: bind: 0.0.0.0 port: 24224 replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" diff --git a/manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml b/manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml index cbeb3a193..f35d699d5 100644 --- a/manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml +++ b/manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml @@ -11,7 +11,7 @@ spec: bind: 0.0.0.0 port: 24224 replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" diff --git a/manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml b/manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml index e8f19b1e4..18429e844 100644 --- a/manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml +++ b/manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml @@ -11,7 +11,7 @@ spec: bind: 0.0.0.0 port: 24224 replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true" diff --git a/manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml b/manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml index 4086131a6..73c47748c 100644 --- a/manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml +++ b/manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml @@ -11,7 +11,7 @@ spec: bind: 0.0.0.0 port: 24224 replicas: 1 - image: kubesphere/fluentd:v1.15.3 + image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0 fluentdCfgSelector: matchLabels: config.fluentd.fluent.io/enabled: "true"