From 0b1f157ddf10ed8bcd67f21c0ae7423c18ab4f59 Mon Sep 17 00:00:00 2001
From: naumanrana <nauman.09@gmail.com>
Date: Wed, 22 Jan 2020 13:28:08 -0500
Subject: [PATCH] Adding SASL_SSL dependencies for the rdkafka plugin

Signed-off-by: nauman.rana1 <nauman.rana@bell.ca>
---
 templates/Dockerfile.erb | 10 +++++++---
 templates/Gemfile.erb    |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/Dockerfile.erb b/templates/Dockerfile.erb
index 2492989ab8..95e6057086 100644
--- a/templates/Dockerfile.erb
+++ b/templates/Dockerfile.erb
@@ -18,12 +18,14 @@ ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 
 COPY Gemfile* /fluentd/
   RUN buildDeps="sudo make gcc g++ libc-dev libffi-dev<% if target == "graylog" %> build-essential patch zlib1g-dev liblzma-dev<% elsif target == "kafka" %> build-essential autoconf automake libtool pkg-config<% end %><% if requires_git %> git<% end %>" \
+  runtimeDeps="<% if target == "kafka" %>krb5-kdc libsasl2-modules-gssapi-mit libsasl2-dev <% end %>" \
+     && export DEBIAN_FRONTEND=noninteractive \
      && apt-get update \
      && apt-get upgrade -y \
      && apt-get install \
      -y --no-install-recommends \
-     $buildDeps net-tools \
-    && gem install bundler --version 1.16.2 \
+     $buildDeps $runtimeDeps net-tools \
+    && gem install bundler --version 2.1.2 \
     && bundle config silence_root_warning true \
     && bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \
     && SUDO_FORCE_REMOVE=yes \
@@ -32,7 +34,9 @@ COPY Gemfile* /fluentd/
                   $buildDeps \
  && rm -rf /var/lib/apt/lists/* \
     && gem sources --clear-all \
-    && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
+    && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem <% if target == "kafka" %> \
+    && ldd $(gem contents rdkafka | grep librdkafka.so) | grep libsasl2.so.2 
+    <% end %> 
 
 # Copy configuration files
 COPY ./conf/fluent.conf /fluentd/etc/
diff --git a/templates/Gemfile.erb b/templates/Gemfile.erb
index fae1969909..f92ff59138 100644
--- a/templates/Gemfile.erb
+++ b/templates/Gemfile.erb
@@ -91,7 +91,8 @@ gem "fluent-plugin-remote_syslog"
 gem "fluent-plugin-kubernetes_remote_syslog"
 <% end %>
 <% when "kafka" %>
-gem "fluent-plugin-kafka", "~> 0.7.9"
+gem "rdkafka", "~> 0.7.0"
+gem "fluent-plugin-kafka", "~> 0.12.2"
 gem "snappy", "~> 0.0.15"
 <% when "kinesis" %>
 <% if is_v1 %>