kubernetes-operator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3358ac68090f121f15b4bfa168326d9cfd33e4d530f60ae2e3242ba301bae1a4
-  data.tar.gz: 2e62d68f997c3053be146015e03871107abbb623a702686dd61548b05f57820e
+  metadata.gz: 83963b3c22a901a21e928ef4d683280d133248d07f1ed7d1cf02d83b916561f9
+  data.tar.gz: 7d2d04740dcdb702005726cef792aa4092da283c9b03f76cf87b80d3375b0ad0
 SHA512:
-  metadata.gz: a03d0fe648c787b302b80ce1c679a8a205cf8932a8a25e36337da2f42f201960c77447cfbcb1944adea10a5552ef96f45e82d11b14d10e6d02c85c83fd0f052e
-  data.tar.gz: 63e672371e83231a590b5399fbe887e71bb9ee2782e8cf57897a7532de8ad5d11fd797c7b49eee916c969f639349bd09d3f585d1abcae55b2901cf91ab504f43
+  metadata.gz: 5146353f6e711946675360d29ff113b83e5e275899681b2aab5c2e7495f306eb6eef5b5eca9e06f341765919d70d4752056e7a05269c11da328b8d2dbea0515c
+  data.tar.gz: fbda282a918ccb75283b6500890c95c1cfa64ae703041d94a656d32488e5f1757e486f2602a92a8cbd937d2c48fc7cbb720c8b54f691820b796c62b9024b8638

data/lib/kubernetes-operator.rb

@@ -117,6 +117,7 @@ class KubernetesOperator
     # @param options [Hash] Additional options
     # @option options [Hash] sleepTimer Time to wait for retry if the watch event stops
     # @option options [Hash] namespace Watch only an namespace, default watch all namespaces
+    # @option options [Hash] showSkipEvents Log an message on each event from kubernetes watch api
     # @option options [Hash] persistence_location Location for the yaml store, default is /tmp/persistence
     def initialize(crdGroup, crdVersion, crdPlural, options = {} )
         # parameter
@@ -128,6 +129,7 @@ class KubernetesOperator
         @options = options
         @options[:sleepTimer] ||= 10
         @options[:namespace] ||= nil
+        @options[:showSkipEvents] ||= false
 
         # create persistence
         @options[:persistence_location] ||= "/tmp/persistence"
@@ -234,6 +236,7 @@ class KubernetesOperator
                 end
                 watcher.each do |notice|
                     begin
+                        @objOrgNamespace = notice[:object][:metadata][:namespace]
                         isCached = @store.transaction{@store[notice[:object][:metadata][:uid]]}
                         case notice[:type]
                         # new cr was added
@@ -245,18 +248,20 @@ class KubernetesOperator
                                 resp = @addMethod.call(notice[:object])
                                 # update status
                                 if resp.is_a?(Hash) && resp[:status]
-                                    @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name]+"/status", {status: resp[:status]},'merge-patch',@options[:namespace])
+                                    @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name]+"/status", {status: resp[:status]},'merge-patch',@objOrgNamespace)
                                 end
                                 # add finalizer
                                 @logger.info("add finalizer to #{notice[:object][:metadata][:name]} (#{notice[:object][:metadata][:uid]})")
-                                patched = @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name], {metadata: {finalizers: ["#{@crdPlural}.#{@crdVersion}.#{@crdGroup}"]}},'merge-patch',@options[:namespace])
+                                patched = @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name], {metadata: {finalizers: ["#{@crdPlural}.#{@crdVersion}.#{@crdGroup}"]}},'merge-patch',@objOrgNamespace)
                                 # save version
                                 @store.transaction do
                                     @store[patched[:metadata][:uid]] = patched[:metadata][:resourceVersion]
                                     @store.commit
                                 end
                             else
-                                @logger.info("skip add action for #{notice[:object][:metadata][:name]} (#{notice[:object][:metadata][:uid]}), found version in cache")
+                                if @options[:showSkipEvents]
+                                    @logger.info("skip add action for #{notice[:object][:metadata][:name]} (#{notice[:object][:metadata][:uid]}), found version in cache")
+                                end
                             end
                         # cr was change or deleted (if finalizer is set, it an modified call, not an delete)
                         when "MODIFIED"
@@ -269,7 +274,7 @@ class KubernetesOperator
                                     resp = @updateMethod.call(notice[:object])
                                     # update status
                                     if resp[:status]
-                                        @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name]+"/status", {status: resp[:status]},'merge-patch',@options[:namespace])
+                                        @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name]+"/status", {status: resp[:status]},'merge-patch',@objOrgNamespace)
                                     end
                                     # save version
                                     @store.transaction do
@@ -282,10 +287,12 @@ class KubernetesOperator
                                     @deleteMethod.call(notice[:object])
                                     # remove finalizer
                                     @logger.info("remove finalizer to #{notice[:object][:metadata][:name]} (#{notice[:object][:metadata][:uid]})")
-                                    patched = @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name], {metadata: {finalizers: nil}},'merge-patch',@options[:namespace])
+                                    patched = @k8sclient.patch_entity(@crdPlural,notice[:object][:metadata][:name], {metadata: {finalizers: nil}},'merge-patch',@objOrgNamespace)
                                 end
                             else
-                                @logger.info("skip update action for #{notice[:object][:metadata][:name]} (#{notice[:object][:metadata][:uid]}), found version in cache")
+                                if @options[:showSkipEvents]
+                                    @logger.info("skip update action for #{notice[:object][:metadata][:name]} (#{notice[:object][:metadata][:uid]}), found version in cache")
+                                end
                             end
                         when "DELETED"
                             # clear events, if delete was successfuly

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-operator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tobias Kuntzsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient