Skip to content

Commit

Permalink
Merge pull request #1200 from joshuabaird/chore/fluentd-references-1170
Browse files Browse the repository at this point in the history
Update references to fluentd:1.17.0 image
  • Loading branch information
benjaminhuo authored Jun 12, 2024
2 parents 2e83272 + e726814 commit 91c7cae
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-fd-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions apis/fluentd/v1alpha1/tests/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/fluentd/fluentd-cluster-cfg-output-es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 91c7cae

Please sign in to comment.