fog-kubevirt 1.3.4 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e403e8a8bffea6ae2d48104dc39d7b98acfdc4af0b1484ab569060d6e2df45
-  data.tar.gz: abd04bab68de9a88916e7b534050643beea7c6305b4647cc746e5cc971fb252c
+  metadata.gz: 57c10d7e3e9cf5cb70626ab8157c3a2f562ed9f508eeda6626df9214271e6184
+  data.tar.gz: 466642cb5d2de4786f9d937b8a9f345efd20eb949a9ecc16e54d1838bda24fee
 SHA512:
-  metadata.gz: f599a11c355c7cf59272f6773976bbdeb164cdb4e4c61202805e79b595475330fcfc57eb38177e45d2b129761436b6924a8ab101d7551a838870e11830335eff
-  data.tar.gz: 26e460f286f1e07d58b51105df89dba62ccbd39163e219938b1256e686e49ba61c15cf69562c418ed23f9a1b24bbedec2b2887940c05182d0c8bd0aee534af2a
+  metadata.gz: 8a95e033a9af266409f96be809c530bad1d11074046561e79a529313962a1aac4d968ae0b75058b0aea232e995379cde9daf522b55d7a95b8023e25b7e910d01
+  data.tar.gz: 81684ff5ee8008a6adf281c8d34dd7c0c85411afddd7bd8d1417419e330ae1ce11d368fa86b5334e4027856fe77910fe4038f2546da6dc5be521a086a6c789ab

data/lib/fog/kubevirt/compute/compute.rb

@@ -148,6 +148,11 @@ module Fog
         #
         STORAGE_GROUP = 'storage.k8s.io'.freeze
 
+        #
+        # The API group of the Openshift Templates extension:
+        #
+        TEMPLATE_GROUP = 'template.openshift.io'.freeze
+
         def initialize(options={})
           require 'kubeclient'
 
@@ -285,7 +290,7 @@ module Fog
             populate_notice_attributes(template, notice)
             template
           end
-          watch = openshift_client.watch_templates(opts)
+          watch = openshift_template_client.watch_templates(opts)
 
           WatchWrapper.new(watch, mapper)
         end
@@ -431,8 +436,8 @@ module Fog
           version
         end
 
-        def openshift_client
-          create_client('/oapi')
+        def openshift_template_client
+          create_client('/apis/' + TEMPLATE_GROUP)
         end
 
         def kube_client
@@ -455,6 +460,10 @@ module Fog
           @log
         end
 
+        def cert_expired?(cert)
+          Time.now > cert.not_after
+        end
+
         #
         # Prepare the TLS and authentication options that will be used for the
         # standard Kubernetes API and also for the KubeVirt extension
@@ -472,6 +481,7 @@ module Fog
 
             cert_store = OpenSSL::X509::Store.new
             certs.each do |cert|
+              raise ::Fog::Kubevirt::Errors::ValidationError, "Certificate has been expired" if cert_expired?(cert)
               cert_store.add_cert(cert)
             end
 

data/lib/fog/kubevirt/compute/models/services.rb

@@ -12,12 +12,16 @@ module Fog
         def all(filters = {})
           begin
             srvs = service.list_services(filters)
+
+            @kind = srvs.kind
+            @resource_version = srvs.resource_version
           rescue ::Fog::Kubevirt::Errors::ClientError
             # we assume that we get 404
             srvs = []
+
+            @kind = 'Service'
           end
-          @kind = srvs.kind
-          @resource_version = srvs.resource_version
+
           load srvs
         end
 

data/lib/fog/kubevirt/compute/models/templates.rb

@@ -12,12 +12,16 @@ module Fog
         def all(filters = {})
           begin
             temps = service.list_templates(filters)
+
+            @kind = temps.kind
+            @resource_version = temps.resource_version
           rescue ::Fog::Kubevirt::Errors::ClientError
             # we assume that we get 404
             temps = []
+
+            @kind = 'Template'
           end
-          @kind = temps.kind
-          @resource_version = temps.resource_version
+
           load temps
         end
 

data/lib/fog/kubevirt/compute/models/vminstances.rb

@@ -12,12 +12,16 @@ module Fog
         def all(filters = {})
           begin
             vms = service.list_vminstances(filters)
+
+            @kind = vms.kind
+            @resource_version = vms.resource_version
           rescue ::Fog::Kubevirt::Errors::ClientError
             # we assume that we get 404
             vms = []
+
+            @kind = 'VirtualMachineInstance'
           end
-          @kind = vms.kind
-          @resource_version = vms.resource_version
+
           load vms
         end
 

data/lib/fog/kubevirt/compute/models/vms.rb

@@ -14,12 +14,16 @@ module Fog
         def all(filters = {})
           begin
             vms = service.list_vms(filters)
+
+            @kind = vms.kind
+            @resource_version = vms.resource_version
           rescue ::Fog::Kubevirt::Errors::ClientError
             # we assume that we get 404
             vms = []
+
+            @kind = 'VirtualMachine'
           end
-          @kind = vms.kind
-          @resource_version = vms.resource_version
+
           load vms
         end
 

data/lib/fog/kubevirt/compute/requests/get_template.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
         def get_template(name)
-          Template.parse object_to_hash( openshift_client.get_template(name, @namespace) )
+          Template.parse object_to_hash( openshift_template_client.get_template(name, @namespace) )
         end
       end
 

data/lib/fog/kubevirt/compute/requests/list_templates.rb

@@ -5,7 +5,7 @@ module Fog
     class Compute
       class Real
         def list_templates(_filters = {})
-          temps = openshift_client.get_templates(namespace: @namespace)
+          temps = openshift_template_client.get_templates(namespace: @namespace)
           entities = temps.map do |kubevirt_obj|
             Template.parse object_to_hash(kubevirt_obj)
           end

data/lib/fog/kubevirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Kubevirt
-    VERSION = '1.3.4'
+    VERSION = '1.3.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.7
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -11,11 +11,13 @@ authors:
 - Adam Grare
 - Boris Odnopozov
 - Shira Maximov
+- yifatmakias
+- Beni Cherniavsky-Paskin
 - Wesley Beary
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -119,25 +121,33 @@ dependencies:
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 5.0.0
 description: This library can be used as a module for `fog`.
 email:
 - piotr.kliczewski@gmail.com
 - masayag@redhat.com
 - plribeiro3000@gmail.com
 - gilles@redhat.com
-- agrare@redhat.com
+- adam@grare.com
 - bodnopoz@redhat.com
 - shiramaximov@gmail.com
+- ymakias@redhat.com
+- cben@redhat.com
 - geemus@gmail.com
 executables: []
 extensions: []
@@ -244,7 +254,7 @@ homepage: https://github.com/fog/fog-kubevirt
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,8 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Kubevirt.
 test_files: