KubeVirt Default Image (#563)

kaovilai · web-flow · commit bbf19c5b48da · 2022-02-02T17:24:33.000-05:00
* KubeVirt Plugin

* Add kubevirt to defaultPlugins used in e2e

* add kubevirt to alm-examples

* switched to konveyor

* set ENV

* remove redundant entry. Already added plugin to settings.json
diff --git a/api/v1alpha1/oadp_types.go b/api/v1alpha1/oadp_types.go
@@ -38,6 +38,7 @@ const DefaultPluginGCP DefaultPlugin = "gcp"
 const DefaultPluginMicrosoftAzure DefaultPlugin = "azure"
 const DefaultPluginCSI DefaultPlugin = "csi"
 const DefaultPluginOpenShift DefaultPlugin = "openshift"
+const DefaultPluginKubeVirt DefaultPlugin = "kubevirt"
 
 type CustomPlugin struct {
 	Name  string `json:"name"`
@@ -54,6 +55,7 @@ const GCPPluginImageKey UnsupportedImageKey = "gcpPluginImageFqin"
 const CSIPluginImageKey UnsupportedImageKey = "csiPluginImageFqin"
 const ResticRestoreImageKey UnsupportedImageKey = "resticRestoreImageFqin"
 const RegistryImageKey UnsupportedImageKey = "registryImageFqin"
+const KubeVirtPluginImageKey UnsupportedImageKey = "kubevirtPluginImageFqin"
 
 type VeleroConfig struct {
 	// FeatureFlags defines the list of features to enable for Velero instance
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/oadp-operator.clusterserviceversion.yaml b/bundle/manifests/oadp-operator.clusterserviceversion.yaml
@@ -38,7 +38,8 @@ metadata:
               "velero": {
                 "defaultPlugins": [
                   "openshift",
-                  "aws"
+                  "aws",
+                  "kubevirt"
                 ]
               }
             },
@@ -479,6 +480,8 @@ spec:
                         value: velero-plugin-for-gcp
                       - name: VELERO_AZURE_PLUGIN_REPO
                         value: velero-plugin-for-microsoft-azure
+                      - name: VELERO_KUBEVIRT_PLUGIN_REPO
+                        value: kubevirt-velero-plugin
                       - name: VELERO_CSI_PLUGIN_REPO
                         value: velero-plugin-for-csi
                       - name: VELERO_TAG
@@ -493,6 +496,8 @@ spec:
                         value: latest
                       - name: VELERO_CSI_PLUGIN_TAG
                         value: latest
+                      - name: VELERO_KUBEVIRT_PLUGIN_TAG
+                        value: 0.2.0
                     image: quay.io/konveyor/oadp-operator:latest
                     imagePullPolicy: Always
                     livenessProbe:
@@ -615,4 +620,6 @@ spec:
       name: csi_plugin
     - image: quay.io/konveyor/registry:latest
       name: registry
+    - image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
+      name: kubevirt_plugin
   version: 99.0.0
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -59,6 +59,8 @@ spec:
             value: velero-plugin-for-gcp
           - name: VELERO_AZURE_PLUGIN_REPO
             value: velero-plugin-for-microsoft-azure
+          - name: VELERO_KUBEVIRT_PLUGIN_REPO
+            value: kubevirt-velero-plugin
           - name: VELERO_CSI_PLUGIN_REPO
             value: velero-plugin-for-csi
           - name: VELERO_TAG
@@ -73,6 +75,8 @@ spec:
             value: latest
           - name: VELERO_CSI_PLUGIN_TAG
             value: latest
+          - name: VELERO_KUBEVIRT_PLUGIN_TAG
+            value: 0.2.0
         args:
         - --leader-elect
         image: controller:latest
diff --git a/config/manifests/bases/oadp-operator.clusterserviceversion.yaml b/config/manifests/bases/oadp-operator.clusterserviceversion.yaml
@@ -150,4 +150,6 @@ spec:
     name: csi_plugin
   - image: quay.io/konveyor/registry:latest
     name: registry
+  - image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
+    name: kubevirt_plugin
   version: 99.0.0
diff --git a/config/samples/oadp_v1alpha1_dpa.yaml b/config/samples/oadp_v1alpha1_dpa.yaml
@@ -8,6 +8,7 @@ spec:
       defaultPlugins:
       - openshift
       - aws
+      - kubevirt
     restic:
       enable: true
   backupLocations:
diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -17,6 +17,7 @@ const (
 	GCPPluginImage       = "quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.3.0"
 	CSIPluginImage       = "quay.io/konveyor/velero-plugin-for-csi:konveyor-0.2.0"
 	RegistryImage        = "quay.io/konveyor/registry:oadp-0.3.0"
+	KubeVirtPluginImage  = "quay.io/konveyor/kubevirt-velero-plugin:v0.2.0"
 )
 
 // Plugin names
@@ -26,6 +27,7 @@ const (
 	VeleroPluginForGCP       = "velero-plugin-for-gcp"
 	VeleroPluginForCSI       = "velero-plugin-for-csi"
 	VeleroPluginForOpenshift = "openshift-velero-plugin"
+	KubeVirtPlugin           = "kubevirt-velero-plugin"
 )
 
 // Environment Vars keys
diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
@@ -114,6 +114,16 @@ func getAzurePluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_AZURE_PLUGIN_REPO"), os.Getenv("VELERO_AZURE_PLUGIN_TAG"))
 }
 
+func getKubeVirtPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
+	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.KubeVirtPluginImageKey] != "" {
+		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.KubeVirtPluginImageKey]
+	}
+	if os.Getenv("VELERO_KUBEVIRT_PLUGIN_REPO") == "" {
+		return common.KubeVirtPluginImage
+	}
+	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_KUBEVIRT_PLUGIN_REPO"), os.Getenv("VELERO_KUBEVIRT_PLUGIN_TAG"))
+}
+
 func getPluginImage(pluginName string, dpa *oadpv1alpha1.DataProtectionApplication) string {
 	switch pluginName {
 
@@ -131,6 +141,9 @@ func getPluginImage(pluginName string, dpa *oadpv1alpha1.DataProtectionApplicati
 
 	case common.VeleroPluginForAzure:
 		return getAzurePluginImage(dpa)
+
+	case common.KubeVirtPlugin:
+		return getKubeVirtPluginImage(dpa)
 	}
 	return ""
 }
diff --git a/pkg/credentials/credentials_test.go b/pkg/credentials/credentials_test.go
@@ -381,6 +381,53 @@ func TestCredentials_getPluginImage(t *testing.T) {
 				"VELERO_CSI_PLUGIN_TAG":  "latest",
 			},
 		},
+		// KubeVirt tests
+		{
+			name: "given default Velero CR without env var set, image should be built from default",
+			dpa: &oadpv1alpha1.DataProtectionApplication{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-Velero-CR",
+					Namespace: "test-ns",
+				},
+				Spec: oadpv1alpha1.DataProtectionApplicationSpec{
+					Configuration: &oadpv1alpha1.ApplicationConfig{
+						Velero: &oadpv1alpha1.VeleroConfig{
+							DefaultPlugins: []oadpv1alpha1.DefaultPlugin{
+								oadpv1alpha1.DefaultPluginKubeVirt,
+							},
+						},
+					},
+				},
+			},
+			pluginName: common.KubeVirtPlugin,
+			wantImage:  "quay.io/konveyor/kubevirt-velero-plugin:v0.2.0",
+		},
+		{
+			name: "given default Velero CR with env var set, image should be built via env vars",
+			dpa: &oadpv1alpha1.DataProtectionApplication{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-Velero-CR",
+					Namespace: "test-ns",
+				},
+				Spec: oadpv1alpha1.DataProtectionApplicationSpec{
+					Configuration: &oadpv1alpha1.ApplicationConfig{
+						Velero: &oadpv1alpha1.VeleroConfig{
+							DefaultPlugins: []oadpv1alpha1.DefaultPlugin{
+								oadpv1alpha1.DefaultPluginKubeVirt,
+							},
+						},
+					},
+				},
+			},
+			pluginName: common.KubeVirtPlugin,
+			wantImage:  "quay.io/kubevirt/kubevirt-velero-plugin:latest",
+			setEnvVars: map[string]string{
+				"REGISTRY":                    "quay.io",
+				"PROJECT":                     "kubevirt",
+				"VELERO_KUBEVIRT_PLUGIN_REPO": "kubevirt-velero-plugin",
+				"VELERO_KUBEVIRT_PLUGIN_TAG":  "latest",
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/tests/e2e/common.go b/tests/e2e/common.go
@@ -229,4 +229,3 @@ func isCredentialsSecretDeleted(namespace string, credSecretRef string) wait.Con
 		return false, err
 	}
 }
-
diff --git a/tests/e2e/e2e_suite_test.go b/tests/e2e/e2e_suite_test.go
@@ -50,7 +50,7 @@ var _ = BeforeSuite(func() {
 	if errString != "" {
 		Expect(errors.New(errString)).NotTo(HaveOccurred())
 	}
-	
+
 	credData, err := readFile(cloud)
 	Expect(err).NotTo(HaveOccurred())
 	err = createCredentialsSecret(credData, namespace, getSecretRef(credSecretRef))
diff --git a/tests/e2e/templates/default_settings.json b/tests/e2e/templates/default_settings.json
@@ -3,7 +3,9 @@
       "configuration":{
         "velero":{
           "defaultPlugins": [
-            "openshift", "aws"
+            "openshift",
+            "aws",
+            "kubevirt"
           ]
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ const (`
`17`	`17`	`GCPPluginImage = "quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.3.0"`
`18`	`18`	`CSIPluginImage = "quay.io/konveyor/velero-plugin-for-csi:konveyor-0.2.0"`
`19`	`19`	`RegistryImage = "quay.io/konveyor/registry:oadp-0.3.0"`
	`20`	`+ KubeVirtPluginImage = "quay.io/konveyor/kubevirt-velero-plugin:v0.2.0"`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`// Plugin names`
`@@ -26,6 +27,7 @@ const (`
`26`	`27`	`VeleroPluginForGCP = "velero-plugin-for-gcp"`
`27`	`28`	`VeleroPluginForCSI = "velero-plugin-for-csi"`
`28`	`29`	`VeleroPluginForOpenshift = "openshift-velero-plugin"`
	`30`	`+ KubeVirtPlugin = "kubevirt-velero-plugin"`
`29`	`31`	`)`
`30`	`32`
`31`	`33`	`// Environment Vars keys`
Original file line number	Diff line number	Diff line change
`@@ -229,4 +229,3 @@ func isCredentialsSecretDeleted(namespace string, credSecretRef string) wait.Con`
`229`	`229`	`return false, err`
`230`	`230`	`}`
`231`	`231`	`}`
`232`		`-`