Bump release to version 1.1.1 - support watcher fix (#24)

* Backfill develop from master release branch 1.1.0 (#20)

* Release Fluent Plugin Kubernetes Objects v1.1.0  (#17)

* modified watcher function to fix failure after an hour (#21)

* prep for 1.1.1 release (#22)

Author: Donald Tregonning

.circleci/build_and_push.sh

@@ -4,7 +4,7 @@ aws ecr get-login --region $AWS_REGION --no-include-email | bash
 echo "Building docker image..."
 cp /tmp/pkg/fluent-plugin-kubernetes-objects-*.gem docker
 echo "Copy latest fluent-plugin-splunk-hec gem from S3"
-docker build --build-arg VERSION=$FLUENT_SPLUNK_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-objects:ci ./docker
+docker build --build-arg VERSION=$VERSION --build-arg FLUENT_SPLUNK_HEC_GEM_VERSION=$FLUENT_SPLUNK_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-objects:ci ./docker
 docker tag splunk/fluent-plugin-kubernetes-objects:ci $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-objects:latest
 echo "Push docker image to ecr..."
 docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-objects:latest | awk 'END{print}'

.circleci/build_and_push_to_dockerhub.sh

@@ -3,7 +3,7 @@ set -e
 echo "Building docker image..."
 cp /tmp/pkg/fluent-plugin-kubernetes-objects-*.gem docker
 VERSION=`cat VERSION`
-docker build --build-arg VERSION=$VERSION --no-cache -t splunk/fluent-plugin-kubernetes-objects:ci ./docker
+docker build --build-arg VERSION=$VERSION --build-arg FLUENT_SPLUNK_HEC_GEM_VERSION=$FLUENT_SPLUNK_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-objects:ci ./docker
 docker tag splunk/fluent-plugin-kubernetes-objects:ci splunk/${DOCKERHUB_REPO_NAME}:${VERSION}
 echo "Push docker image to splunk dockerhub..."
 docker login --username=$DOCKERHUB_ACCOUNT_ID --password=$DOCKERHUB_ACCOUNT_PASS

.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 *.gem
 .DS_Store
 *.aes

Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.0.0)
-      fluentd (~> 1.3)
+    fluent-plugin-kubernetes-objects (1.1.1)
+      fluentd (~> 1.4)
       kubeclient (~> 4.2)
 
 GEM
@@ -17,7 +17,7 @@ GEM
     docile (1.3.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    fluentd (1.3.3)
+    fluentd (1.4.1)
       cool.io (>= 1.4.5, < 2.0.0)
       dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -39,15 +39,15 @@ GEM
     http-form_data (2.1.1)
     http_parser.rb (0.6.0)
     json (2.1.0)
-    kubeclient (4.2.2)
+    kubeclient (4.3.0)
       http (~> 3.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     minitest (5.11.3)
-    msgpack (1.2.6)
+    msgpack (1.2.9)
     netrc (0.11.0)
     power_assert (1.1.3)
     public_suffix (3.0.3)
@@ -72,7 +72,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.9)
+    tzinfo-data (1.2019.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

docker/Dockerfile

@@ -4,7 +4,10 @@ LABEL maintainer="Splunk Inc. <[email protected]>"
 LABEL Description="Splunk Connect for Kubernetes docker image" Vendor="Splunk Inc."
 
 ARG VERSION
+ARG FLUENT_SPLUNK_HEC_GEM_VERSION
 ENV VERSION=${VERSION}
+ENV FLUENT_SPLUNK_HEC_GEM_VERSION=${FLUENT_SPLUNK_HEC_GEM_VERSION}
+
 
 # skip runtime bundler installation
 ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
@@ -21,7 +24,7 @@ RUN set -e \
  && gem install -N fluent-plugin-prometheus -v "1.3.0" \
  && gem install -N fluent-plugin-jq -v "0.5.1" \
  && gem install -N oj -v "3.7.9" \
- && gem install -N fluent-plugin-splunk-hec:${VERSION} \
+ && gem install -N fluent-plugin-splunk-hec:${FLUENT_SPLUNK_HEC_GEM_VERSION} \
  && gem install -N /tmp/*.gem \
  && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.1/dumb-init_1.2.1_$dpkgArch \

fluent-plugin-kubernetes-objects.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'fluentd', '~> 1.3'
+  spec.add_runtime_dependency 'fluentd', '~> 1.4'
   spec.add_runtime_dependency 'kubeclient', '~> 4.2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

lib/fluent/plugin/in_kubernetes_objects.rb

@@ -5,7 +5,7 @@
 
 module Fluent::Plugin
   class KubernetesObjectsInput < Fluent::Plugin::Input
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
 
     Fluent::Plugin.register_input('kubernetes_objects', self)
 
@@ -72,6 +72,9 @@ class KubernetesObjectsInput < Fluent::Plugin::Input
 
       desc 'A selector to restrict the list of returned objects by fields.'
       config_param :field_selector, :string, default: nil
+
+      desc 'The interval at which the objects will be watched.'
+      config_param :interval, :time, default: 15 * 60
     end
 
     config_section :storage do
@@ -140,7 +143,7 @@ def initialize_client
         if @bearer_token_file.nil? && File.exist?(secret_token_file)
           @bearer_token_file = secret_token_file
         end
-    end
+      end
 
       ssl_options = {
         client_cert: @client_cert && OpenSSL::X509::Certificate.new(File.read(@client_cert)),
@@ -174,10 +177,12 @@ def start_watchers
         o = o.to_h.dup
         o[:as] = :raw
         resource_name = o.delete(:resource_name)
+        watch_interval = o.delete(:interval)
+
         version = @storage.get(resource_name)
         o[:resource_version] = version if version
         @client.public_send("watch_#{resource_name}", o).tap do |watcher|
-          create_watcher_thread resource_name, watcher
+          create_watcher_thread resource_name, watcher, watch_interval
         end
       end
     end
@@ -209,7 +214,7 @@ def create_pull_thread(conf)
                         ->(item) { item['metadata'].update requestResourceVersion: resource_version }
                       else
                         ->(item) {}
-          end
+                      end
 
           # result['items'] might be nil due to https://github.com/kubernetes/kubernetes/issues/13096
           items = result['items'].to_a
@@ -222,14 +227,17 @@ def create_pull_thread(conf)
       end
     end
 
-    def create_watcher_thread(object_name, watcher)
+    def create_watcher_thread(object_name, watcher, interval)
       thread_create(:"watch_#{object_name}") do
         tag = generate_tag "#{object_name}.watch"
-        watcher.each do |entity|
-          log.trace { "Received new object from watching #{object_name}" }
-          entity = JSON.parse(entity)
-          router.emit tag, Fluent::Engine.now, entity
-          @storage.put object_name, entity['object']['metadata']['resourceVersion']
+        while thread_current_running?
+          watcher.each do |entity|
+            log.trace { "Received new object from watching #{object_name}" }
+            entity = JSON.parse(entity)
+            router.emit tag, Fluent::Engine.now, entity
+            @storage.put object_name, entity['object']['metadata']['resourceVersion']
+            sleep(interval)
+          end
         end
       end
     end

test/fluent/plugin/in_kubernetes_objects_test.rb

@@ -135,7 +135,7 @@
         stub_k8s_events params: {resourceVersion: "123456"}
 
         d.run expect_emits: 1, timeout: 3
-            ensure
+      ensure
         f.unlink
       end
     end