fog-kubevirt 0.3.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a9419e80245eff2f02bac207711317b6503432
-  data.tar.gz: 530e0f33df50161f668f78bc57d25b00c1b10951
+  metadata.gz: ef12aa5c8c8f76da4468c2addf70d01f798fca2e
+  data.tar.gz: 59e0ce857ec78e72f2f47fce4b59b4789aee9bfe
 SHA512:
-  metadata.gz: f5c986661f483f6c05e9b20f4b8d7ce2b04fa4e079d6b0e228d6fe69698e9ed9197c072a1e49661b87cff6d76a8782cdaf9e46fe30d54053dd0ddf3db95cfe4c
-  data.tar.gz: 807de8ea60c22dde2538805218be5eb80105b081701cb65ad470636a9f01012d4d3c209b860092ba9ecc1e96c3f5c715690d7e679298a7ab7d7cd0eb86123b87
+  metadata.gz: b715da932cbe7359039d796391e3fa1b149c7abafbd918d1c828bd761e026c3d5049d672fb11f0ff822c9faa86240b47e1536c7aa664c16d87df3be618be5482
+  data.tar.gz: f1d024c7a07089912a574cc0336475818ea71c284ff814a25bcc9edf4cf7047f0df2a114d54b82aa09af990b575a9aa73423a28defaeda70f5f24327e06b8719

data/README.md

@@ -22,14 +22,13 @@ Or install it yourself as:
 
 Require the gem:
 ```ruby
-require 'fog/kubevirt' 
+require 'fog/kubevirt'
 ```
 
 Connect to kubevirt instance:
 ```ruby
 
-compute = Fog::Compute.new(
-          :provider        => "kubevirt",
+compute = Fog::Kubevirt::Compute.new
           :kubevirt_token  => token,
           :kubevirt_server => server,
           :kubevirt_port   => port

data/lib/fog/bin/kubevirt.rb

@@ -3,7 +3,7 @@ class Kubevirt < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::Kubevirt
+        Fog::Kubevirt::Compute
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -13,7 +13,7 @@ class Kubevirt < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
                     when :compute
-                      Fog::Compute.new(:provider => 'Kubevirt')
+                      Fog::Kubevirt::Compute.new
                     else
                       raise ArgumentError, "Unrecognized service: #{key.inspect}"
                     end

data/lib/fog/kubevirt.rb

@@ -1,11 +1,8 @@
 require 'fog/core'
 
 module Fog
-  module Compute
-    autoload :Kubevirt, File.expand_path('../compute/kubevirt', __FILE__)
-  end
-
   module Kubevirt
+    autoload :Compute, 'fog/kubevirt/compute/compute'
     extend Fog::Provider
 
     module Errors

data/lib/fog/{compute/kubevirt.rb → kubevirt/compute/compute.rb}

@@ -1,75 +1,40 @@
 require 'delegate'
-require 'json'
-require 'rest-client'
 
 require "fog/core"
 
 module Fog
-  module Compute
-    class Kubevirt < Fog::Service
-      recognizes :kubevirt_token, :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, \
-                 :kubevirt_log, :kubevirt_verify_ssl, :kubevirt_ca_cert
+  module Kubevirt
+    class Compute < Fog::Service
+      requires   :kubevirt_token
+      recognizes :kubevirt_hostname, :kubevirt_port, :kubevirt_namespace, :kubevirt_log
 
-      model_path 'fog/compute/kubevirt/models'
+      model_path 'fog/kubevirt/compute/models'
       model      :vminstance
       collection :vminstances
-      model      :networkattachmentdef
-      collection :networkattachmentdefs
       model      :node
       collection :nodes
       model      :vm
       collection :vms
-      model      :persistentvolume
-      collection :persistentvolumes
-      model      :pvc
-      collection :pvcs
-      model      :server
-      collection :servers
-      model      :service
-      collection :services
-      model      :storageclass
-      collection :storageclasses
       model      :template
       collection :templates
       model      :volume
       collection :volumes
 
-      request_path 'fog/compute/kubevirt/requests'
-      request :create_networkattachmentdef
+      request_path 'fog/kubevirt/compute/requests'
+
       request :create_vm
       request :create_vminstance
-      request :create_persistentvolume
       request :create_pvc
-      request :create_service
-      request :create_storageclass
-      request :delete_networkattachmentdef
-      request :delete_persistentvolume
-      request :delete_pvc
-      request :delete_service
-      request :delete_storageclass
       request :delete_vminstance
       request :delete_vm
       request :get_vminstance
-      request :get_networkattachmentdef
       request :get_node
-      request :get_persistentvolume
-      request :get_pvc
       request :get_vm
-      request :get_server
-      request :get_service
-      request :get_storageclass
       request :get_template
       request :list_vminstances
       request :list_nodes
-      request :list_networkattachmentdefs
       request :list_vms
-      request :list_persistentvolumes
-      request :list_pvcs
-      request :list_servers
-      request :list_services
-      request :list_storageclasses
       request :list_templates
-      request :list_volumes
       request :update_vm
 
       module Shared
@@ -85,9 +50,8 @@ module Fog
         end
 
         class ExceptionWrapper
-          def initialize(client, version)
+          def initialize(client)
             @client = client
-            @version = version
           end
 
           def method_missing(symbol, *args)
@@ -107,10 +71,6 @@ module Fog
           def respond_to_missing?(method_name, include_private = false)
             @client.respond_to?(symbol, include_all) || super
           end
-
-          def version
-            @version
-          end
         end
 
         #
@@ -162,24 +122,17 @@ module Fog
         include Shared
 
         #
-        # The API group of KubeVirt:
-        #
-        KUBEVIRT_GROUP = 'kubevirt.io'.freeze
-
-        #
-        # The API group of the Kubernetes core:
+        # The API version and group of the Kubernetes core:
         #
         CORE_GROUP = ''.freeze
+        CORE_VERSION = 'v1'.freeze
 
         #
-        # The API group of the Kubernetes network extention:
-        #
-        NETWORK_GROUP = 'k8s.cni.cncf.io'.freeze
-
-        #
-        # The API group of the Kubernetes network extention:
+        # The API version and group of KubeVirt:
         #
-        STORAGE_GROUP = 'storage.k8s.io'.freeze
+        KUBEVIRT_GROUP = 'kubevirt.io'.freeze
+        KUBEVIRT_VERSION = 'v1alpha2'.freeze
+        KUBEVIRT_VERSION_LABEL = KUBEVIRT_GROUP + '/' + KUBEVIRT_VERSION
 
         def initialize(options={})
           require 'kubeclient'
@@ -192,8 +145,13 @@ module Fog
           @log ||= ::Logger.new(STDOUT)
 
           @namespace = options[:kubevirt_namespace] || 'default'
+
+          # Prepare the TLS and authentication options that will be used for the standard Kubernetes API
+          # and also for the KubeVirt extension:
           @opts = {
-            :ssl_options  => obtain_ssl_options(options),
+            :ssl_options  => {
+              :verify_ssl => OpenSSL::SSL::VERIFY_NONE,
+            },
             :auth_options => {
               :bearer_token => @kubevirt_token
             }
@@ -291,7 +249,7 @@ module Fog
             populate_notice_attributes(vminstance, notice)
             vminstance
           end
-          watch = kubevirt_client.watch_virtual_machine_instances(opts)
+          watch = kubevirt_client.watch_virtual_machines(opts)
 
           WatchWrapper.new(watch, mapper)
         end
@@ -338,6 +296,7 @@ module Fog
 
         private
 
+
         #
         # Populates required notice attributes
         #
@@ -351,12 +310,18 @@ module Fog
         end
 
         #
-        # Lazily creates the a client for the given Kubernetes API path.
+        # Lazily creates the a client for the given Kubernetes API path and version.
         #
         # @param path [String] The Kubernetes API path.
+        # @param version [String] The Kubernetes API version.
         # @return [Kubeclient::Client] The client for the given path and version.
         #
-        def create_client(path)
+        def create_client(path, version)
+          # Return the client immediately if it has been created before:
+          key = path + '/' + version
+          client = @clients[key]
+          return client if client
+
           # Create the client and save it:
           url = URI::Generic.build(
             :scheme => 'https',
@@ -364,147 +329,33 @@ module Fog
             :port   => @port,
             :path   => path
           )
-
-          if @kubevirt_token.to_s.empty?
-            create_client_from_config(path)
-          else
-            create_client_from_token(url)
-          end
-        end
-
-        def create_client_from_token(url)
-          # Prepare the TLS and authentication options that will be used for the standard Kubernetes API
-          # and also for the KubeVirt extension:
-          @opts = {
-            :ssl_options  => {
-              :verify_ssl => OpenSSL::SSL::VERIFY_NONE,
-            },
-            :auth_options => {
-              :bearer_token => @kubevirt_token
-            }
-          }
-          version = detect_version(url.to_s, @opts[:ssl_options])
-          key = url.path + '/' + version
-
-          client = check_client(key)
-          return client if client
-
           client = Kubeclient::Client.new(
             url.to_s,
             version,
             @opts
           )
-
-          wrap_client(client, version, key)
-        end
-
-        def create_client_from_config(path)
-          config = Kubeclient::Config.read(ENV['KUBECONFIG'] || ENV['HOME']+'/.kube/config')
-          context = config.context
-          url = context.api_endpoint
-          version = detect_version(url + path, context.ssl_options)
-          key = path + '/' + version
-
-          client = check_client(key)
-          return client if client
-
-          client = Kubeclient::Client.new(
-            url + path,
-            version,
-            ssl_options: context.ssl_options,
-            auth_options: context.auth_options
-          )
-
-          wrap_client(client, version, key)
-        end
-
-        def check_client(key)
-          @clients[key]
-        end
-
-        def wrap_client(client, version, key)
-          wrapped_client = ExceptionWrapper.new(client, version)
+          wrapped_client = ExceptionWrapper.new(client)
           @clients[key] = wrapped_client
 
+          # Return the client:
           wrapped_client
         end
 
-        def detect_version(url, ssl_options)
-          options = {
-            ssl_ca_file: ssl_options[:ca_file],
-            ssl_cert_store: ssl_options[:cert_store],
-            verify_ssl: ssl_options[:verify_ssl],
-            ssl_client_cert: ssl_options[:client_cert],
-            ssl_client_key: ssl_options[:client_key],
-          }
-
-          response = ::JSON.parse(RestClient::Resource.new(url, options).get)
-
-          # 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]
-        end
-
         def openshift_client
-          create_client('/oapi')
+          create_client('/oapi', CORE_VERSION)
         end
 
         def kube_client
-          create_client('/api')
+          create_client('/api', CORE_VERSION)
         end
 
         def kubevirt_client
-          create_client('/apis/' + KUBEVIRT_GROUP)
-        end
-
-        def kube_net_client
-          create_client('/apis/' + NETWORK_GROUP)
-        end
-
-        def kube_storage_client
-          create_client('/apis/' + STORAGE_GROUP)
+          create_client('/apis/' + KUBEVIRT_GROUP, KUBEVIRT_VERSION)
         end
 
         def log
           @log
         end
-
-        #
-        # Prepare the TLS and authentication options that will be used for the
-        # standard Kubernetes API and also for the KubeVirt extension
-        #
-        # @param options [Hash] a hash with connection options
-        #
-        def obtain_ssl_options(options)
-          verify_ssl = options[:kubevirt_verify_ssl]
-          if verify_ssl == true
-            ca = options[:kubevirt_ca_cert] || ""
-            ca = IO.read(ca) if File.file?(ca)
-            certs = ca.split(/(?=-----BEGIN)/).reject(&:empty?).collect do |pem|
-              OpenSSL::X509::Certificate.new(pem)
-            end
-
-            cert_store = OpenSSL::X509::Store.new
-            certs.each do |cert|
-              cert_store.add_cert(cert)
-            end
-
-            ssl_options = {
-              :verify_ssl => OpenSSL::SSL::VERIFY_PEER,
-              :cert_store => cert_store
-            }
-          elsif verify_ssl == false || verify_ssl.to_s.empty?
-            ssl_options = {
-              :verify_ssl => OpenSSL::SSL::VERIFY_NONE
-            }
-          else
-            ssl_options = {
-              :verify_ssl => verify_ssl
-            }
-          end
-        end
       end
 
       class Mock

data/lib/fog/{compute/kubevirt → kubevirt/compute}/models/node.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Kubevirt
+  module Kubevirt
+    class Compute
       class Node < Fog::Model
         identity :name
 
@@ -36,4 +36,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/{compute/kubevirt → kubevirt/compute}/models/nodes.rb

@@ -1,13 +1,13 @@
 require 'fog/core/collection'
-require 'fog/compute/kubevirt/models/node'
+require 'fog/kubevirt/compute/models/node'
 
 module Fog
-  module Compute
-    class Kubevirt
+  module Kubevirt
+    class Compute
       class Nodes < Fog::Collection
         attr_reader :kind, :resource_version
 
-        model Fog::Compute::Kubevirt::Node
+        model Fog::Kubevirt::Compute::Node
 
         def all(filters = {})
           nodes = service.list_nodes(filters)

data/lib/fog/{compute/kubevirt → kubevirt/compute}/models/template.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Kubevirt
+  module Kubevirt
+    class Compute
       class Template < Fog::Model
         include Shared
         identity :name,              :aliases => 'metadata_name'

data/lib/fog/{compute/kubevirt → kubevirt/compute}/models/templates.rb

@@ -1,13 +1,13 @@
 require 'fog/core/collection'
-require 'fog/compute/kubevirt/models/template'
+require 'fog/kubevirt/compute/models/template'
 
 module Fog
-  module Compute
-    class Kubevirt
+  module Kubevirt
+    class Compute
       class Templates < Fog::Collection
         attr_reader :kind, :resource_version
 
-        model Fog::Compute::Kubevirt::Template
+        model Fog::Kubevirt::Compute::Template
 
         def all(filters = {})
           begin