ConfiDrive support + fix on dns search

Mirantis · Jan 14, 2018 · 8787842 · 8787842
1 parent 421e727
commit 8787842
Show file tree

Hide file tree

Showing 22 changed files with 346 additions and 92 deletions.
diff --git a/pkg/libvirttools/TestContainerLifecycle.json b/pkg/libvirttools/TestContainerLifecycle.json
@@ -291,7 +291,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__ceph_flexvolume.json b/pkg/libvirttools/TestDomainDefinitions__ceph_flexvolume.json
@@ -373,7 +373,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__cloud-init.json b/pkg/libvirttools/TestDomainDefinitions__cloud-init.json
@@ -287,7 +287,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__cloud-init_with_user_data.json b/pkg/libvirttools/TestDomainDefinitions__cloud-init_with_user_data.json
@@ -287,7 +287,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__plain_domain.json b/pkg/libvirttools/TestDomainDefinitions__plain_domain.json
@@ -287,7 +287,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__raw_devices.json b/pkg/libvirttools/TestDomainDefinitions__raw_devices.json
@@ -336,7 +336,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__vcpu_count.json b/pkg/libvirttools/TestDomainDefinitions__vcpu_count.json
@@ -287,7 +287,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__virtio_disk_driver.json b/pkg/libvirttools/TestDomainDefinitions__virtio_disk_driver.json
@@ -287,7 +287,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainDefinitions__volumes.json b/pkg/libvirttools/TestDomainDefinitions__volumes.json
@@ -545,7 +545,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/TestDomainForcedShutdown.json b/pkg/libvirttools/TestDomainForcedShutdown.json
@@ -287,7 +287,7 @@
  },
  "Auth": null,
  "Source": {
- "File": "/var/lib/virtlet/nocloud/nocloud-231700d5-c9a6-5a49-738d-99a954c51550.iso",
+ "File": "/var/lib/virtlet/config/config-231700d5-c9a6-5a49-738d-99a954c51550.iso",
  "Device": "",
  "Protocol": "",
  "Name": "",

diff --git a/pkg/libvirttools/annotations.go b/pkg/libvirttools/annotations.go
@@ -31,6 +31,7 @@ import (
 )
 
 type DiskDriver string
+type ImageType string
 
 const (
  maxVCPUCount = 255
@@ -40,15 +41,19 @@ const (
  CloudInitUserDataSourceKeyName = "VirtletCloudInitUserDataSource"
  CloudInitUserDataOverwriteKeyName = "VirtletCloudInitUserDataOverwrite"
  CloudInitUserDataScriptKeyName = "VirtletCloudInitUserDataScript"
+ CloudInitImageType = "VirtletCloudInitImageType"
  SSHKeysKeyName = "VirtletSSHKeys"
  SSHKeySourceKeyName = "VirtletSSHKeySource"
  DiskDriverKeyName = "VirtletDiskDriver"
  DiskDriverVirtio DiskDriver = "virtio"
  DiskDriverScsi DiskDriver = "scsi"
+ ImageTypeNoCloud ImageType = "nocloud"
+ ImageTypeConfigDrive ImageType = "configdrive"
 )
 
 type VirtletAnnotations struct {
  VCPUCount int
+ ImageType ImageType
  MetaData map[string]interface{}
  UserData map[string]interface{}
  UserDataOverwrite bool
@@ -119,17 +124,24 @@ func (va *VirtletAnnotations) parsePodAnnotations(ns string, podAnnotations map[
  }
  }
 
+ va.ImageType = ImageType(strings.ToLower(podAnnotations[CloudInitImageType]))
  va.DiskDriver = DiskDriver(podAnnotations[DiskDriverKeyName])
+
  return nil
 }
 
 func (va *VirtletAnnotations) applyDefaults() {
  if va.VCPUCount <= 0 {
  va.VCPUCount = 1
  }
+
  if va.DiskDriver == "" {
  va.DiskDriver = DiskDriverScsi
  }
+
+ if va.ImageType == "" {
+ va.ImageType = ImageTypeNoCloud
+ }
 }
 
 func (va *VirtletAnnotations) validate() error {
@@ -139,7 +151,11 @@ func (va *VirtletAnnotations) validate() error {
  }
 
  if va.DiskDriver != DiskDriverVirtio && va.DiskDriver != DiskDriverScsi {
- errs = append(errs, fmt.Sprintf("bad disk driver %q. Must be either %q or %q", DiskDriverVirtio, DiskDriverScsi))
+ errs = append(errs, fmt.Sprintf("bad disk driver %q. Must be either %q or %q", va.DiskDriver, DiskDriverVirtio, DiskDriverScsi))
+ }
+
+ if va.ImageType != ImageTypeNoCloud && va.ImageType != ImageTypeConfigDrive {
+ errs = append(errs, fmt.Sprintf("unknown config image type %q. Must be either %q or %q", va.ImageType, ImageTypeNoCloud, ImageTypeConfigDrive))
  }
 
  if errs != nil {

diff --git a/pkg/libvirttools/annotations_test.go b/pkg/libvirttools/annotations_test.go
@@ -34,6 +34,7 @@ func TestVirtletAnnotations(t *testing.T) {
  va: &VirtletAnnotations{
  VCPUCount: 1,
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  {
@@ -42,6 +43,16 @@ func TestVirtletAnnotations(t *testing.T) {
  va: &VirtletAnnotations{
  VCPUCount: 1,
  DiskDriver: "scsi",
+ ImageType: "nocloud",
+ },
+ },
+ {
+ name: "non empty cloud init type annotation",
+ annotations: map[string]string{"VirtletCloudInitImageType": "configdrive"},
+ va: &VirtletAnnotations{
+ VCPUCount: 1,
+ DiskDriver: "scsi",
+ ImageType: "configdrive",
  },
  },
  {
@@ -50,6 +61,7 @@ func TestVirtletAnnotations(t *testing.T) {
  va: &VirtletAnnotations{
  VCPUCount: 1,
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  {
@@ -58,6 +70,7 @@ func TestVirtletAnnotations(t *testing.T) {
  va: &VirtletAnnotations{
  VCPUCount: 1,
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  {
@@ -66,6 +79,7 @@ func TestVirtletAnnotations(t *testing.T) {
  va: &VirtletAnnotations{
  VCPUCount: 4,
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  {
@@ -93,6 +107,7 @@ func TestVirtletAnnotations(t *testing.T) {
  },
  SSHKeys: []string{"key1", "key2"},
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  {
@@ -104,6 +119,7 @@ func TestVirtletAnnotations(t *testing.T) {
  VCPUCount: 1,
  UserDataOverwrite: true,
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  {
@@ -115,6 +131,7 @@ func TestVirtletAnnotations(t *testing.T) {
  VCPUCount: 1,
  UserDataScript: "#!/bin/sh\necho hi\n",
  DiskDriver: "scsi",
+ ImageType: "nocloud",
  },
  },
  // bad metadata items follow
@@ -132,6 +149,12 @@ func TestVirtletAnnotations(t *testing.T) {
  "VirtletCloudInitMetaData": "{",
  },
  },
+ {
+ name: "bad cloud-init image type",
+ annotations: map[string]string{
+ "VirtletCloudInitImageType": "ducttape",
+ },
+ },
  {
  name: "bad cloud-init user-data",
  annotations: map[string]string{