fog-kubevirt 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e2d2c6f98b5fa86ae26dfab40696be4b5bae710a8466179ccef3afa175b6f34
-  data.tar.gz: f13369106d1359001eeb59a249499b2f944bf4651da66b52f647a83838b5f6a2
+  metadata.gz: b3179fe8d9931ca7ea27fe0f345109c213c60d030045a4678d2951ec0fad61dd
+  data.tar.gz: ee83703dadbf2509eef8905117a935f1c7cbb14b3aa7f17b2334821502b3592d
 SHA512:
-  metadata.gz: d866029c4dbef7324093049cc6e2c69eac5b6c205633134d7f89d75d25b51f0024e62809d12c66b61e4cd62d6455782340a5e15ce808240c93bc2712b14aa320
-  data.tar.gz: c0adb18fac7ea2530e6552f71f2caf686410eadbdf106c13ff17fefe6fce75a1e4528ce7b78dc48ba49e2104ec0208d9534268abca692956c01c087a54679d48
+  metadata.gz: 7a6fc1a166cdc365409d1ad16aa665d8672037174aa54f66d39698defb4a03ebe8376da5553e64c55dac13129b097e1399af9825a333125601e46a4e78b4eabb
+  data.tar.gz: 408db587d8256e0cfa20f103bab0be5f62f5b56b8acdc2829e1a23e17f1bfaa5dd83f3eb9978975aaf398c2b6cd952675d506b8b1227185a2a60c401582c36a7

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
@@ -60,6 +60,7 @@ module Fog
       request :get_service
       request :get_storageclass
       request :get_template
+      request :get_vnc_console_details
       request :list_vminstances
       request :list_nodes
       request :list_networkattachmentdefs
@@ -147,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)
@@ -283,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
@@ -420,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
@@ -448,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
@@ -465,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/vm_parser.rb

@@ -139,7 +139,7 @@ module Fog
 
             volume.config = v[volume.type.to_sym]
             disk = disks.detect { |d| d.name == volume.name }
-            volume.boot_order = disk.boot_order
+            volume.boot_order = disk.boot_order if disk.respond_to?(:boot_order)
             volume.bus = disk.bus if disk.respond_to?(:bus)
 
             volumes << volume

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

@@ -39,6 +39,10 @@ module Fog
           # delete vm instance
           service.delete_vminstance(name) unless vm_instance.nil?
         end
+
+        def get_vnc_console_details(name, namespace)
+          service.get_vnc_console_details(name, namespace)
+        end
       end
     end
   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/get_vnc_console_details.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Kubevirt
+    class Compute
+      class Real
+        def get_vnc_console_details(name, namespace)
+
+          url = URI::Generic.build(
+              :scheme => 'https',
+              :host   => @host,
+              :port   => @port,
+              :path   => "/apis/kubevirt.io"
+          )
+          version = detect_version(url.to_s, @opts[:ssl_options])
+            {
+             :host => @host,
+             :port => @port,
+             :path => "/apis/subresources.kubevirt.io/#{version}/namespaces/#{namespace}/virtualmachineinstances/#{name}/vnc",
+             :token => @opts[:auth_options][:bearer_token]
+            }
+        end
+      end
+
+      class Mock
+        def get_vnc_console_details(name, namespace)
+        end
+      end
+    end
+  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.1'
+    VERSION = '1.3.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-kubevirt
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 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-07-07 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: []
@@ -199,6 +201,7 @@ files:
 - lib/fog/kubevirt/compute/requests/get_template.rb
 - lib/fog/kubevirt/compute/requests/get_vm.rb
 - lib/fog/kubevirt/compute/requests/get_vminstance.rb
+- lib/fog/kubevirt/compute/requests/get_vnc_console_details.rb
 - lib/fog/kubevirt/compute/requests/list_networkattachmentdefs.rb
 - lib/fog/kubevirt/compute/requests/list_nodes.rb
 - lib/fog/kubevirt/compute/requests/list_persistentvolumes.rb
@@ -243,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
@@ -258,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: