fog-kubevirt 1.3.2 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13af0b3678fefb7ef6709a18c0c6e0ee899eea9d84b80c5e0fb580909251cdb5
-  data.tar.gz: 9b94a11d2b6f16d237fbcdd9699317f14fb396b332a18421c12ae1b31f4f0067
+  metadata.gz: 7dafed958753ab0d7cdd1490fb6676eb74b0c19052f23af6b45390e79ea0860a
+  data.tar.gz: 32d48713cd5c8a191a5bd3dec125e6f2b658f83d4549fc047ac95a374bd4ca0a
 SHA512:
-  metadata.gz: 6923ee0319db3ead3a93b92955081b3fe050a40d77e1e049348eba9fed2a78d53e046ccd8ab39daea3716a3bb1d4616f5e28b18c0ba184715644c63c5c1676ad
-  data.tar.gz: 33024e576e2c80ce45f22f3d5eb46f3ee1c599bcd8efd77354a61c97dc63818fc0c249da6a2a50dbf23083f0dd659299cb69bb44b2ef2df2ee9192c828144895
+  metadata.gz: 65aa9a7aec64f8cc5eb3474b9daa25582b0583e639b58f0879dc8d85309a38e4ce6b1ee373bdde1a88571c4868ec3ef804f5020e5c4e8bc372ba4fa12823843c
+  data.tar.gz: 2efc96fd3b0c058c0755fc0200f4176fa5962ea6dd66760c4d4d68fa29f702079e27c59fb3cab47c47b4a26edcdfed617596d33ff7f3500ffe63229c25288b61

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

@@ -9,7 +9,7 @@ module Fog
   module Kubevirt
     class Compute < Fog::Service
       recognizes :kubevirt_token, :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, \
-                 :kubevirt_log, :kubevirt_verify_ssl, :kubevirt_ca_cert
+                 :kubevirt_log, :kubevirt_verify_ssl, :kubevirt_ca_cert , :kubevirt_version
 
       model_path 'fog/kubevirt/compute/models'
       model      :vminstance
@@ -148,12 +148,18 @@ 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'
 
           @kubevirt_token = options[:kubevirt_token]
           @host = options[:kubevirt_hostname]
           @port = options[:kubevirt_port]
+          @kubevirt_version = options[:kubevirt_version]
 
           @log = options[:kubevirt_log]
           @log ||= ::Logger.new(STDOUT)
@@ -284,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
@@ -421,12 +427,17 @@ module Fog
           # version detected based on
           # https://github.com/kubernetes-incubator/apiserver-builder/blob/master/docs/concepts/aggregation.md#viewing-discovery-information
           preferredVersion = response["preferredVersion"]
-          return preferredVersion["version"] if preferredVersion
-          response["versions"][0]
+          if url.include? KUBEVIRT_GROUP
+            version = @kubevirt_version || preferredVersion["version"]
+          else
+            version = preferredVersion["version"] if preferredVersion
+            version = version || response["versions"][0]
+          end
+          version
         end
 
-        def openshift_client
-          create_client('/oapi')
+        def openshift_template_client
+          create_client('/apis/' + TEMPLATE_GROUP)
         end
 
         def kube_client
@@ -449,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
@@ -466,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.2'
+    VERSION = '1.3.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.6
 platform: ruby
 authors:
 - Piotr Kliczewski
@@ -11,11 +11,12 @@ authors:
 - Adam Grare
 - Boris Odnopozov
 - Shira Maximov
+- yifatmakias
 - Wesley Beary
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -121,23 +122,24 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '4.3'
 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
 - geemus@gmail.com
 executables: []
 extensions: []
@@ -244,7 +246,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 +261,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: