From c17d0cdba79cdf8dbe703759ab142ef463f9b03d Mon Sep 17 00:00:00 2001
From: Kentaro Hayashi <hayashi@clear-code.com>
Date: Wed, 10 Jul 2024 19:00:17 +0900
Subject: [PATCH] Fix incorrect environment name

It is a long standing typo.

Closes: #1383

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
---
 fluentd-daemonset-forward.yaml | 4 ++--
 templates/conf/fluent.conf.erb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fluentd-daemonset-forward.yaml b/fluentd-daemonset-forward.yaml
index ad2daf24f..21eeb8930 100644
--- a/fluentd-daemonset-forward.yaml
+++ b/fluentd-daemonset-forward.yaml
@@ -30,9 +30,9 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.nodeName
-          - name:  FLUENT_FOWARD_HOST
+          - name:  FLUENT_FORWARD_HOST
             value: "REMOTE_ENDPOINT"
-          - name:  FLUENT_FOWARD_PORT
+          - name:  FLUENT_FORWARD_PORT
             value: "18080"
         resources:
           limits:
diff --git a/templates/conf/fluent.conf.erb b/templates/conf/fluent.conf.erb
index 91813c228..4ea9dea47 100644
--- a/templates/conf/fluent.conf.erb
+++ b/templates/conf/fluent.conf.erb
@@ -375,8 +375,8 @@
   @id out_fwd
   @log_level info
   <server>
-    host "#{ENV['FLUENT_FOWARD_HOST']}"
-    port "#{ENV['FLUENT_FOWARD_PORT']}"
+    host "#{ENV['FLUENT_FORWARD_HOST'] || ENV['FLUENT_FOWARD_HOST']}"
+    port "#{ENV['FLUENT_FORWARD_PORT'] || ENV['FLUENT_FOWARD_PORT']}"
   </server>
   <buffer>
     flush_interval "#{ENV['FLUENT_FORWARD_FLUSH_INTERVAL'] || use_default}"