fix image

Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
fluent · Feb 8, 2022 · b632083 · b632083
1 parent c3f4d88
commit b632083
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.complete b/cmd/fluent-watcher/fluentd/Dockerfile.complete
@@ -9,7 +9,7 @@ RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code
 
 # Fluentd main image
 FROM alpine:3.13
-LABEL Description="Fluentd docker image" Vendor="Kubesphere Organization" Version="1.14.4"
+LABEL Description="Fluentd docker image" Vendor="KubeSphere Organization" Version="1.14.4"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement

diff --git a/cmd/fluent-watcher/fluentd/base/Dockerfile b/cmd/fluent-watcher/fluentd/base/Dockerfile
@@ -2,7 +2,7 @@
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
 FROM alpine:3.13
-LABEL Description="Fluentd docker image" Vendor="Kubesphere Organization" Version="1.14.4"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.14.4"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement

diff --git a/manifests/forward/fluentd-cluster-cfg-output-es.yaml b/manifests/forward/fluentd-cluster-cfg-output-es.yaml
@@ -11,7 +11,7 @@ spec:
         bind: 0.0.0.0
         port: 24224
   replicas: 1
-  image: zhu733756/fluentd:config-reloader
+  image: kubesphere/fluentd:v1.14.4-amd64
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

diff --git a/manifests/forward/fluentd-namespaced-cfg-output-es.yaml b/manifests/forward/fluentd-namespaced-cfg-output-es.yaml
@@ -11,7 +11,7 @@ spec:
         bind: 0.0.0.0
         port: 24224
   replicas: 1
-  image: zhu733756/fluentd:config-reloader
+  image: kubesphere/fluentd:v1.14.4-amd64
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

diff --git a/manifests/quick-start/fluentd-forward.yaml b/manifests/quick-start/fluentd-forward.yaml
@@ -12,7 +12,7 @@ spec:
         bind: 0.0.0.0
         port: 24224
   replicas: 1
-  image: zhu733756/fluentd:config-reloader
+  image: kubesphere/fluentd:v1.14.4-amd64
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

diff --git a/manifests/quick-start/fluentd-http.yaml b/manifests/quick-start/fluentd-http.yaml
@@ -12,7 +12,7 @@ spec:
         bind: 0.0.0.0
         port: 9880
   replicas: 1
-  image: zhu733756/fluentd:latest
+  image: kubesphere/fluentd:v1.14.4-amd64
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

diff --git a/manifests/setup/fluent-operator-deployment.yaml b/manifests/setup/fluent-operator-deployment.yaml
@@ -39,7 +39,7 @@ spec:
           mountPath: /var/run/docker.sock
       containers:
       - name: fluent-operator
-        image: zhu733756/fluent-operator:latest-amd64
+        image: kubesphere/fluent-operator:v1.0.0
         resources:
           limits:
             cpu: 200m

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -11093,7 +11093,7 @@ spec:
         app.kubernetes.io/name: fluent-operator
     spec:
       containers:
-      - image: zhu733756/fluent-operator:latest-amd64
+      - image: kubesphere/fluent-operator:v1.0.0
         name: fluent-operator
         resources:
           limits: