fix: handle IPv6 KUBERNETES_SERVICE_HOST (#437)

SumoLogic · Jul 21, 2023 · ad20c5e · ad20c5e
1 parent 3db207f
commit ad20c5e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/fluent-plugin-enhance-k8s-metadata/lib/fluent/plugin/filter_enhance_k8s_metadata.rb b/fluent-plugin-enhance-k8s-metadata/lib/fluent/plugin/filter_enhance_k8s_metadata.rb
@@ -128,7 +128,15 @@ def normalize_param
           log.info 'Kubernetes URL is not set - inspecting environment'
           env_host = ENV['KUBERNETES_SERVICE_HOST']
           env_port = ENV['KUBERNETES_SERVICE_PORT']
-          @kubernetes_url = "https://#{env_host}:#{env_port}" unless env_host.nil? || env_port.nil?
+          if present?(env_host) && present?(env_port)
+            if env_host =~ Resolv::IPv6::Regex
+              # Brackets are needed around IPv6 addresses
+              env_host = "[#{env_host}]"
+            end
+            @kubernetes_url = "https://#{env_host}:#{env_port}"
+          else
+            log.debug "No Kubernetes URL could be found in config or environment"
+          end
         end
         log.debug "Kubernetes URL: '#{@kubernetes_url}'"
 

diff --git a/fluent-plugin-events/lib/fluent/plugin/in_events.rb b/fluent-plugin-events/lib/fluent/plugin/in_events.rb
@@ -191,7 +191,15 @@ def normalize_param
           log.debug 'Kubernetes URL is not set - inspecting environment'
           env_host = ENV['KUBERNETES_SERVICE_HOST']
           env_port = ENV['KUBERNETES_SERVICE_PORT']
-          @kubernetes_url = "https://#{env_host}:#{env_port}" unless env_host.nil? || env_port.nil?
+          if present?(env_host) && present?(env_port)
+            if env_host =~ Resolv::IPv6::Regex
+              # Brackets are needed around IPv6 addresses
+              env_host = "[#{env_host}]"
+            end
+            @kubernetes_url = "https://#{env_host}:#{env_port}"
+          else
+            log.debug "No Kubernetes URL could be found in config or environment"
+          end
         end
         log.debug "Kubernetes URL: '#{@kubernetes_url}'"