foreman_kubevirt 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047c3c576cffc11ac38028063e77ae28ee2c745a8d52cb15e850302d8e8ae7b9
-  data.tar.gz: e6702a70f3f11f02308fe60fee93e249651130da0b5be3d2c6a0aed738a0937a
+  metadata.gz: 783060e275700cf232b4068e0aa0ca75b4f790805fa30b95f19148f15e9ca5a5
+  data.tar.gz: ec15a1ba2ce6c55f570e489b25ab8fb4d68d7ac26ee9714707dc3483d2b03abb
 SHA512:
-  metadata.gz: 26662b78b48492daccf15104cdb60007dfefca4b54dc3220236a5c1352ba34d5bc0e73427ae766964d62cd793116dde28e9435ada4f766da926a3e32448027f8
-  data.tar.gz: 3ea4e5596fc47f99c3c6da252a6222c85881b277d067a5b45a429bd1e03f1618b16431cdcc00662f7a75f7f2e110b731ad9bbca253be42577d1de7ab102e4e4b
+  metadata.gz: 9070f9c4676ebc0aa275a486a831da1bcdde007fdbf318866a554c50c5ce81219a93ba2e9f3a68116658ca8e7c235ef9e5df382b8d3cbdd6169673087f3a7ca5
+  data.tar.gz: 2f7e8c104bb2695c3be90bc8b9d8a44b68c352f4922cd78343efbf428bf6de6055f617faeb22a12609ffaebd4c8ea3e19af698428642d995091514d0e3700b53

data/app/models/foreman_kubevirt/kubevirt.rb

@@ -180,23 +180,27 @@ module ForemanKubevirt
       logger.debug("creating VM with the following options: #{options.inspect}")
 
       # Add clound init user data
-      user_data = { "userData" => options[:user_data] } if options[:user_data].present?
+      user_data = options[:user_data]
 
       begin
         volumes, volume_templates = create_volumes_for_vm(options)
         interfaces, networks = create_network_devices_for_vm(options, volumes)
+        userdata_secret = create_userdata_secret(user_data, options[:name]) if user_data.present?
         client.vms.create(:vm_name     => options[:name],
                           :cpus        => options[:cpu_cores].to_i,
                           :memory_size => convert_memory(options[:memory] + "b", :mi).to_s,
                           :memory_unit => "Mi",
                           :volumes     => volumes,
                           :volume_templates => volume_templates,
-                          :cloudinit   => user_data,
+                          :cloudinit   => userdata_secret_ref(userdata_secret),
                           :networks    => networks,
                           :interfaces  => interfaces)
-        client.servers.get(options[:name])
+        vm = client.servers.get(options[:name])
+        update_userdata_secret_owner(userdata_secret, options[:name], vm.uid) if userdata_secret.present?
+        vm
       rescue Exception => e
         delete_pvcs(volumes) if volumes
+        delete_userdata_secret(userdata_secret) if userdata_secret.present?
         raise e
       end
     end
@@ -530,6 +534,35 @@ module ForemanKubevirt
       [interfaces, networks]
     end
 
+    def create_userdata_secret(user_data, vm_name)
+      client.secrets.create(:name => "#{vm_name}-userdata", :namespace => namespace, :data => { "userData" => Base64.encode64(user_data) })
+    end
+
+    # Update the owner reference of the userdata secret to the VM
+    # This is needed to ensure that the secret is deleted when the VM is deleted
+    def update_userdata_secret_owner(secret, vm_name, vm_uid)
+      secret.metadata['ownerReferences'] = [{
+        apiVersion: "kubevirt.io/v1",
+        kind: "VirtualMachine",
+        name: vm_name,
+        uid: vm_uid
+      }]
+      secret.save
+    end
+
+    def delete_userdata_secret(secret)
+      secret.destroy
+    end
+
+    def userdata_secret_ref(userdata_secret)
+      return nil if userdata_secret.nil?
+      {
+        'secretRef': {
+          name: userdata_secret.name,
+        }
+      }
+    end
+
     def convert_memory(memory, unit)
       ::Fog::Kubevirt::Utils::UnitConverter.convert(memory, unit).to_i
     end

data/lib/foreman_kubevirt/version.rb

@@ -1,3 +1,3 @@
 module ForemanKubevirt
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/test/models/compute_resources/kubevirt_test.rb

@@ -16,16 +16,27 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
     pvcs.stubs(:delete)
     servers = stub
     servers.stubs(:get)
+    secrets = stub
     storageclasses = stub
     storageclasses.stubs(:all).returns([{ 'name': 'local' }])
     client = stub
     client.stubs(:vms).returns(vms)
     client.stubs(:pvcs).returns(pvcs)
     client.stubs(:servers).returns(servers)
+    client.stubs(:secrets).returns(secrets)
     client.stubs(:storageclasses).returns(storageclasses)
     client
   end
 
+  def mock_userdata_secret(name: "test-userdata")
+    metadata = {}
+    secret = stub(name: name)
+    secret.stubs(:metadata).returns(metadata)
+    secret.stubs(:save)
+    secret.stubs(:destroy)
+    secret
+  end
+
   test "host_interfaces_attrs" do
     record = new_kubevirt_vcr
     host = ::FactoryBot.build(:host_kubevirt, :with_interfaces)
@@ -103,6 +114,89 @@ class ForemanKubevirtTest < ActiveSupport::TestCase
       end
       assert_match(/A bootable volume is required as a target for the image/, error.message)
     end
+
+    test "without user_data, cloudinit is nil" do
+      record = new_kubevirt_vcr
+      client = mocked_client
+      record.stubs(:client).returns(client)
+
+      client.vms.expects(:create).with do |args|
+        assert_nil args[:cloudinit]
+      end
+
+      record.create_vm({ :name => "test", :volumes_attributes => { 0 => { :capacity => "5" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+    end
+
+    test "with user_data, creates secret and passes secretRef" do
+      record = new_kubevirt_vcr
+      client = mocked_client
+      record.stubs(:client).returns(client)
+
+      user_data = "#!/bin/bash\necho hello"
+      mock_secret = mock_userdata_secret(name: "test-userdata")
+
+      client.secrets.expects(:create).with do |args|
+        assert_equal "test-userdata", args[:name]
+        assert_equal record.namespace, args[:namespace]
+        assert_equal Base64.encode64(user_data), args[:data]["userData"]
+      end.returns(mock_secret)
+
+      client.vms.expects(:create).with do |args|
+        assert_equal({ secretRef: { name: "test-userdata" } }, args[:cloudinit])
+      end
+
+      vm = stub(uid: "vm-uid-123")
+      client.servers.stubs(:get).with("test").returns(vm)
+
+      record.create_vm({ :name => "test", :user_data => user_data, :volumes_attributes => { 0 => { :capacity => "5" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+    end
+
+    test "with user_data, updates secret owner after VM creation" do
+      record = new_kubevirt_vcr
+      client = mocked_client
+      record.stubs(:client).returns(client)
+
+      user_data = "#!/bin/bash\necho hello"
+      metadata = {}
+      mock_secret = stub(name: "test-userdata")
+      mock_secret.stubs(:metadata).returns(metadata)
+      mock_secret.stubs(:save)
+      mock_secret.stubs(:destroy)
+
+      client.secrets.expects(:create).returns(mock_secret)
+
+      client.vms.expects(:create)
+      vm = stub(uid: "vm-uid-456")
+      client.servers.stubs(:get).with("test").returns(vm)
+
+      mock_secret.expects(:save).once
+
+      record.create_vm({ :name => "test", :user_data => user_data, :volumes_attributes => { 0 => { :capacity => "5" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+
+      assert_equal 1, metadata["ownerReferences"].length
+      assert_equal "kubevirt.io/v1", metadata["ownerReferences"][0][:apiVersion]
+      assert_equal "VirtualMachine", metadata["ownerReferences"][0][:kind]
+      assert_equal "test", metadata["ownerReferences"][0][:name]
+      assert_equal "vm-uid-456", metadata["ownerReferences"][0][:uid]
+    end
+
+    test "with user_data, on exception destroys secret" do
+      record = new_kubevirt_vcr
+      client = mocked_client
+      record.stubs(:client).returns(client)
+
+      user_data = "#!/bin/bash\necho hello"
+      mock_secret = mock_userdata_secret(name: "test-userdata")
+
+      client.secrets.expects(:create).returns(mock_secret)
+      client.vms.expects(:create).raises(StandardError.new("vm create failed"))
+      mock_secret.expects(:destroy).once
+
+      error = assert_raises(StandardError) do
+        record.create_vm({ :name => "test", :user_data => user_data, :volumes_attributes => { 0 => { :capacity => "5" } }, :interfaces_attributes => { "0" => { "cni_provider" => "multus", "network" => "default/network" } } })
+      end
+      assert_equal "vm create failed", error.message
+    end
   end
 
   describe "create_network_element" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_kubevirt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Moti Asayag
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Provision and manage Kubevirt Virtual Machines from Foreman
 test_files: