Don't use params field, if they are nil, while cloning volumesnapshot…

…class (#1145) * Don't use params field while cloning volumesnapshotclass While cloning `VolumeSnapshotClass`, as part of #1128 we started passing params. But we should not pass params if the values is `nil`, because in that case creation `VolumeSnapshotClass` fails with `nil` not allowed. * Refactor, address review comments Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
kanisterio · Nov 19, 2021 · 5fab1bb · 5fab1bb
1 parent f0d642c
commit 5fab1bb
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/pkg/kube/snapshot/snapshot_alpha.go b/pkg/kube/snapshot/snapshot_alpha.go
@@ -422,17 +422,22 @@ func UnstructuredVolumeSnapshotContentAlpha(name, snapshotName, snapshotNs, dele
 }
 
 func UnstructuredVolumeSnapshotClassAlpha(name, driver, deletionPolicy string, params map[string]string) *unstructured.Unstructured {
-	return &unstructured.Unstructured{
-		Object: map[string]interface{}{
-			"apiVersion": fmt.Sprintf("%s/%s", v1alpha1.GroupName, v1alpha1.Version),
-			"kind":       VolSnapClassKind,
-			"metadata": map[string]interface{}{
-				"name": name,
-			},
-			VolSnapClassAlphaDriverKey: driver,
-			"deletionPolicy":           deletionPolicy,
-			"parameters":               Mss2msi(params),
+	obj := map[string]interface{}{
+		"apiVersion": fmt.Sprintf("%s/%s", v1alpha1.GroupName, v1alpha1.Version),
+		"kind":       VolSnapClassKind,
+		"metadata": map[string]interface{}{
+			"name": name,
 		},
+		VolSnapClassAlphaDriverKey: driver,
+		"deletionPolicy":           deletionPolicy,
+	}
+
+	if params != nil {
+		obj["parameters"] = Mss2msi(params)
+	}
+
+	return &unstructured.Unstructured{
+		Object: obj,
 	}
 }
 

diff --git a/pkg/kube/snapshot/snapshot_beta.go b/pkg/kube/snapshot/snapshot_beta.go
@@ -402,17 +402,21 @@ func UnstructuredVolumeSnapshotContent(gvr schema.GroupVersionResource, name, sn
 }
 
 func UnstructuredVolumeSnapshotClass(gvr schema.GroupVersionResource, name, driver, deletionPolicy string, params map[string]string) *unstructured.Unstructured {
-	return &unstructured.Unstructured{
-		Object: map[string]interface{}{
-			"apiVersion": fmt.Sprintf("%s/%s", gvr.Group, gvr.Version),
-			"kind":       VolSnapClassKind,
-			"metadata": map[string]interface{}{
-				"name": name,
-			},
-			VolSnapClassBetaDriverKey: driver,
-			"deletionPolicy":          deletionPolicy,
-			"parameters":              Mss2msi(params),
+	obj := map[string]interface{}{
+		"apiVersion": fmt.Sprintf("%s/%s", gvr.Group, gvr.Version),
+		"kind":       VolSnapClassKind,
+		"metadata": map[string]interface{}{
+			"name": name,
 		},
+		VolSnapClassBetaDriverKey: driver,
+		"deletionPolicy":          deletionPolicy,
+	}
+	if params != nil {
+		obj["parameters"] = Mss2msi(params)
+	}
+
+	return &unstructured.Unstructured{
+		Object: obj,
 	}
 }