kubeclient 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5552be66b20798c35381487804e97569949799f
-  data.tar.gz: 83a18e7c1c6239b6b1bb1e201134200caac6d4ee
+  metadata.gz: d647693b6947c9d717f0b19dad1c1cadc46f14b7
+  data.tar.gz: 1355734798902a5b0f890568df9276cc390205b7
 SHA512:
-  metadata.gz: f71802cdea55b41565cf7e044b740ceeb280a763cb8ef5230a5fe470944acbb798b3a26cd6f684c90468a666a763c0eff1c6c59a21c487e6c56d0e2fa4151a45
-  data.tar.gz: ff7daf8d166dc97c26b89a5e08576b18456d0eddff34b9413e9b6dfd1680e527deb6af8e284fda1c6830dbb3cb8d77871dd1ad477803b5ce1ffb0bdaea498c70
+  metadata.gz: d0f30f0903cbb179aee65b8a5e28f743e45ea6500752df248694f4ae57aaa46b98a6561638a83c915ce20cf0787159457ad85a2d7ac5573eec6913d83fe0989e
+  data.tar.gz: 6a696571fe8281b2dad5d6f01f429c7d02a51913272a711dd315bbbd27f9f291e41ab60a89d8dd92a0a96f7a91931ddbedb880c691b653f6498d44480d5d0268

data/.rubocop.yml

@@ -2,6 +2,8 @@ MethodLength:
   Enabled: false
 ClassLength:
   Enabled: false
+Documentation:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/LineLength:
@@ -13,3 +15,5 @@ Metrics/CyclomaticComplexity:
   Max: 8
 Style/FileName:
   Exclude: [Gemfile*]
+Style/SignalException:
+  Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+Notable changes to this project will be documented in this file.
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
+
+## 2.5.2 - 2018-02-04
+### Fixed
+- Watch results are now `RecursiveOpenStruct` inside arrays too (#279).
+- Fixed watch `.finish` sometimes caused `Errno::EBADF` exception from the reading loop (#280).
+- Easing dependency version (#287, #301)  
+
+## 2.5.1 - 2017-10-12
+No changes since 2.5.0, fixed packaging mistake.
+
+## [2.5.0 - 2017-10-12 was YANKED]
+
+### Added
+
+- `as: raw` option for `get_*` methods returning a string (#262 via #271)
+
+## 2.4.0 - 2017-05-10

data/kubeclient.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'rubocop', '= 0.30.0'
   spec.add_dependency 'rest-client'
-  spec.add_dependency 'recursive-open-struct', '= 1.0.0'
-  spec.add_dependency 'http', '= 0.9.8'
+  spec.add_dependency 'recursive-open-struct', '~> 1.0.0'
+  spec.add_dependency 'http', '< 3', '>= 0.98'
 end

data/lib/kubeclient/version.rb

@@ -1,4 +1,4 @@
 # Kubernetes REST-API Client
 module Kubeclient
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/lib/kubeclient/watch_notice.rb

@@ -1,7 +1,12 @@
 require 'recursive_open_struct'
 module Kubeclient
   module Common
+    # Represents an individual notice received from a Kubernetes watch
     class WatchNotice < RecursiveOpenStruct
+      def initialize(hash = nil, args = {})
+        args[:recurse_over_arrays] = true
+        super(hash, args)
+      end
     end
   end
 end

data/lib/kubeclient/watch_stream.rb

@@ -27,7 +27,7 @@ module Kubeclient
             yield @format == :json ? WatchNotice.new(JSON.parse(line)) : line.chomp
           end
         end
-      rescue IOError
+      rescue IOError, Errno::EBADF
         raise unless @finished
       end
 

data/test/json/node_notice.json

@@ -0,0 +1,160 @@
+{
+  "type": "ADDED",
+  "object": {
+    "apiVersion": "v1",
+    "kind": "Node",
+    "metadata": {
+      "annotations": {
+        "volumes.kubernetes.io/controller-managed-attach-detach": "true"
+      },
+      "creationTimestamp": "2017-12-11T12:00:13Z",
+      "labels": {
+        "beta.kubernetes.io/arch": "amd64",
+        "beta.kubernetes.io/os": "linux",
+        "kubernetes.io/hostname": "openshift.local",
+        "openshift-infra": "apiserver"
+      },
+      "name": "openshift.local",
+      "resourceVersion": "367410",
+      "selfLink": "/api/v1/nodes/openshift.local",
+      "uid": "d88c7af6-de6a-11e7-8725-52540080f1d2"
+    },
+    "spec": {
+      "externalID": "openshift.local"
+    },
+    "status": {
+      "addresses": [
+        {
+          "address": "192.168.122.40",
+          "type": "InternalIP"
+        },
+        {
+          "address": "openshift.local",
+          "type": "Hostname"
+        }
+      ],
+      "allocatable": {
+        "cpu": "2",
+        "memory": "8072896Ki",
+        "pods": "20"
+      },
+      "capacity": {
+        "cpu": "2",
+        "memory": "8175296Ki",
+        "pods": "20"
+      },
+      "conditions": [
+        {
+          "lastHeartbeatTime": "2017-12-15T00:36:13Z",
+          "lastTransitionTime": "2017-12-11T12:00:13Z",
+          "message": "kubelet has sufficient disk space available",
+          "reason": "KubeletHasSufficientDisk",
+          "status": "False",
+          "type": "OutOfDisk"
+        },
+        {
+          "lastHeartbeatTime": "2017-12-15T00:36:13Z",
+          "lastTransitionTime": "2017-12-11T12:00:13Z",
+          "message": "kubelet has sufficient memory available",
+          "reason": "KubeletHasSufficientMemory",
+          "status": "False",
+          "type": "MemoryPressure"
+        },
+        {
+          "lastHeartbeatTime": "2017-12-15T00:36:13Z",
+          "lastTransitionTime": "2017-12-11T12:00:13Z",
+          "message": "kubelet has no disk pressure",
+          "reason": "KubeletHasNoDiskPressure",
+          "status": "False",
+          "type": "DiskPressure"
+        },
+        {
+          "lastHeartbeatTime": "2017-12-15T00:36:13Z",
+          "lastTransitionTime": "2017-12-14T15:43:39Z",
+          "message": "kubelet is posting ready status",
+          "reason": "KubeletReady",
+          "status": "True",
+          "type": "Ready"
+        }
+      ],
+      "daemonEndpoints": {
+        "kubeletEndpoint": {
+          "Port": 10250
+        }
+      },
+      "images": [
+        {
+          "names": [
+            "docker.io/openshift/origin@sha256:908c6c9ccf0e0feefe2658899656c6e73d2854777fa340738fb903f0a40c328d",
+            "docker.io/openshift/origin:latest"
+          ],
+          "sizeBytes": 1222636603
+        },
+        {
+          "names": [
+            "docker.io/openshift/origin-deployer@sha256:3d324bce1870047edc418041cefdec88e0a5bbb5b3b9f6fd35b43f14919a656c",
+            "docker.io/openshift/origin-deployer:v3.7.0"
+          ],
+          "sizeBytes": 1098951248
+        },
+        {
+          "names": [
+            "docker.io/cockpit/kubernetes@sha256:a8e58cd5e6f5a4d12d1e2dfd339686b74f3c22586952ca7aa184dc254ab49714",
+            "docker.io/cockpit/kubernetes:latest"
+          ],
+          "sizeBytes": 375926556
+        },
+        {
+          "names": [
+            "docker.io/cockpit/kubernetes@sha256:0745b3823efc57e03a5ef378614dfcb6c2b1e3964220bbf908fb3046a91cef70"
+          ],
+          "sizeBytes": 350062743
+        },
+        {
+          "names": [
+            "docker.io/openshift/origin-service-catalog@sha256:ef851e06276af96838a93320d0e4be51cc8de6e5afb2fb0efd4e56cec114b937"
+          ],
+          "sizeBytes": 284732029
+        },
+        {
+          "names": [
+            "docker.io/openshift/origin-service-catalog@sha256:8addfd742d92d8da819b091d6bda40edc45e88d1446ffd1ad658b6d21b3c36fd"
+          ],
+          "sizeBytes": 284731998
+        },
+        {
+          "names": [
+            "docker.io/openshift/origin-service-catalog@sha256:b3a737cc346b3cae85ef2f5d020b607781a1cac38fe70678cb78fee2c2a3bf8a"
+          ],
+          "sizeBytes": 284731943
+        },
+        {
+          "names": [
+            "docker.io/openshift/origin-service-catalog@sha256:957934537721da33362693d4f1590dc79dc5da7438799bf14d645165768e53ef",
+            "docker.io/openshift/origin-service-catalog:latest"
+          ],
+          "sizeBytes": 283929631
+        },
+        {
+          "names": [
+            "docker.io/openshift/origin-pod@sha256:2c257d83a01607b229ef5e3dca09f52c3a2a2788c09dc33f0444ec4e572a9e1d",
+            "docker.io/openshift/origin-pod:v3.7.0"
+          ],
+          "sizeBytes": 218423400
+        }
+      ],
+      "nodeInfo": {
+        "architecture": "amd64",
+        "bootID": "75be791d-88a2-4f56-a588-c071a80bf7cf",
+        "containerRuntimeVersion": "docker://1.12.6",
+        "kernelVersion": "3.10.0-693.11.1.el7.x86_64",
+        "kubeProxyVersion": "v1.7.6+a08f5eeb62",
+        "kubeletVersion": "v1.7.6+a08f5eeb62",
+        "machineID": "adf09ffc2de2624aa5ed335727c7400d",
+        "operatingSystem": "linux",
+        "osImage": "CentOS Linux 7 (Core)",
+        "systemUUID": "FC9FF0AD-E22D-4A62-A5ED-335727C7400D"
+      }
+    }
+  }
+}

data/test/test_watch.rb

@@ -116,4 +116,25 @@ class TestWatch < MiniTest::Test
                      "#{api_host}/v1/watch/events?fieldSelector=#{selector}",
                      times: 1)
   end
+
+  def test_watch_with_finish_and_ebadf
+    api_host = 'http://localhost:8080/api'
+
+    stub_request(:get, %r{/api/v1$})
+      .to_return(body: open_test_file('core_api_resource_list.json'),
+                 status: 200)
+    stub_request(:get, %r{.*\/watch/events})
+      .to_return(body: open_test_file('watch_stream.json'), status: 200)
+
+    client = Kubeclient::Client.new(api_host, 'v1')
+    watcher = client.watch_events
+
+    # explodes when Errno::EBADF is not caught
+    watcher.each do
+      watcher.finish
+      raise Errno::EBADF
+    end
+
+    assert_requested(:get, "#{api_host}/v1/watch/events", times: 1)
+  end
 end

data/test/test_watch_notice.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class TestWatchNotice < MiniTest::Test
+  #
+  # Checks that elements of arrays are converted to instances of `RecursiveOpenStruct`, and that the
+  # items can be accessed using the dot notation.
+  #
+  def test_recurse_over_arrays
+    json = JSON.parse(open_test_file('node_notice.json').read)
+    notice = Kubeclient::Common::WatchNotice.new(json)
+    assert_kind_of(Array, notice.object.status.addresses)
+    notice.object.status.addresses.each do |address|
+      assert_kind_of(RecursiveOpenStruct, address)
+    end
+    assert_equal('InternalIP', notice.object.status.addresses[0].type)
+    assert_equal('192.168.122.40', notice.object.status.addresses[0].address)
+    assert_equal('Hostname', notice.object.status.addresses[1].type)
+    assert_equal('openshift.local', notice.object.status.addresses[1].address)
+  end
+
+  #
+  # Checks that even when arrays are converted to instances of `RecursiveOpenStruct` the items can
+  # be accessed using the hash notation.
+  #
+  def test_access_array_items_as_hash
+    json = JSON.parse(open_test_file('node_notice.json').read)
+    notice = Kubeclient::Common::WatchNotice.new(json)
+    assert_kind_of(Array, notice.object.status.addresses)
+    notice.object.status.addresses.each do |address|
+      assert_kind_of(RecursiveOpenStruct, address)
+    end
+    assert_equal('InternalIP', notice.object.status.addresses[0]['type'])
+    assert_equal('192.168.122.40', notice.object.status.addresses[0]['address'])
+    assert_equal('Hostname', notice.object.status.addresses[1]['type'])
+    assert_equal('openshift.local', notice.object.status.addresses[1]['address'])
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,30 +112,36 @@ dependencies:
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.98'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0.98'
 description: A client for Kubernetes REST api
 email:
 - abonas@redhat.com
@@ -146,6 +152,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile-rest-client-1.8.rb
 - LICENSE.txt
@@ -191,6 +198,7 @@ files:
 - test/json/namespace_list.json
 - test/json/node.json
 - test/json/node_list.json
+- test/json/node_notice.json
 - test/json/persistent_volume.json
 - test/json/persistent_volume_claim.json
 - test/json/persistent_volume_claim_list.json
@@ -237,6 +245,7 @@ files:
 - test/test_service.rb
 - test/test_service_account.rb
 - test/test_watch.rb
+- test/test_watch_notice.rb
 - test/txt/pod_log.txt
 - test/valid_token_file
 homepage: https://github.com/abonas/kubeclient
@@ -259,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A client for Kubernetes REST api
@@ -294,6 +303,7 @@ test_files:
 - test/json/namespace_list.json
 - test/json/node.json
 - test/json/node_list.json
+- test/json/node_notice.json
 - test/json/persistent_volume.json
 - test/json/persistent_volume_claim.json
 - test/json/persistent_volume_claim_list.json
@@ -340,5 +350,6 @@ test_files:
 - test/test_service.rb
 - test/test_service_account.rb
 - test/test_watch.rb
+- test/test_watch_notice.rb
 - test/txt/pod_log.txt
 - test/valid_token_file