operator: fix conversion web hook

Not all fields were getting copied. The test was incomplete and
therefore didn't catch that mistake.

Author: pohly

pkg/apis/pmemcsi/v1alpha1/deployment_conversion.go

@@ -37,15 +37,21 @@ func (d *Deployment) ConvertTo(dst conversion.Hub) error {
 
 	// no change in other fields
 	out.ObjectMeta = in.ObjectMeta
-	out.Spec.LogLevel = in.Spec.LogLevel
 	out.Spec.Image = in.Spec.Image
-	out.Spec.CACert = in.Spec.CACert
+	out.Spec.PullPolicy = in.Spec.PullPolicy
+	out.Spec.ProvisionerImage = in.Spec.ProvisionerImage
+	out.Spec.NodeRegistrarImage = in.Spec.NodeRegistrarImage
+	out.Spec.DeviceMode = v1beta1.DeviceMode(string(in.Spec.DeviceMode))
+	out.Spec.LogLevel = in.Spec.LogLevel
 	out.Spec.RegistryCert = in.Spec.RegistryCert
 	out.Spec.RegistryPrivateKey = in.Spec.RegistryPrivateKey
 	out.Spec.NodeControllerCert = in.Spec.NodeControllerCert
 	out.Spec.NodeControllerPrivateKey = in.Spec.NodeControllerPrivateKey
+	out.Spec.CACert = in.Spec.CACert
 	out.Spec.NodeSelector = in.Spec.NodeSelector
+	out.Spec.PMEMPercentage = in.Spec.PMEMPercentage
 	out.Spec.Labels = in.Spec.Labels
+	out.Spec.KubeletDir = in.Spec.KubeletDir
 
 	out.Status.Components = nil
 	for _, s := range in.Status.Components {
@@ -88,15 +94,21 @@ func (d *Deployment) ConvertFrom(src conversion.Hub) error {
 
 	// no change in other fields
 	out.ObjectMeta = in.ObjectMeta
-	out.Spec.LogLevel = in.Spec.LogLevel
 	out.Spec.Image = in.Spec.Image
-	out.Spec.CACert = in.Spec.CACert
+	out.Spec.PullPolicy = in.Spec.PullPolicy
+	out.Spec.ProvisionerImage = in.Spec.ProvisionerImage
+	out.Spec.NodeRegistrarImage = in.Spec.NodeRegistrarImage
+	out.Spec.DeviceMode = DeviceMode(string(in.Spec.DeviceMode))
+	out.Spec.LogLevel = in.Spec.LogLevel
 	out.Spec.RegistryCert = in.Spec.RegistryCert
 	out.Spec.RegistryPrivateKey = in.Spec.RegistryPrivateKey
 	out.Spec.NodeControllerCert = in.Spec.NodeControllerCert
 	out.Spec.NodeControllerPrivateKey = in.Spec.NodeControllerPrivateKey
+	out.Spec.CACert = in.Spec.CACert
 	out.Spec.NodeSelector = in.Spec.NodeSelector
+	out.Spec.PMEMPercentage = in.Spec.PMEMPercentage
 	out.Spec.Labels = in.Spec.Labels
+	out.Spec.KubeletDir = in.Spec.KubeletDir
 
 	out.Status.Components = nil
 	for _, s := range in.Status.Components {

test/e2e/operator/deployment_api.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"reflect"
 	"strings"
 	"time"
 
@@ -947,25 +948,41 @@ var _ = deploy.DescribeForSome("API", func(d *deploy.Deployment) bool {
 			Expect(alphaCR.Status).Should(BeEquivalentTo(cr.Status), "status mismatch")
 		})
 		It("with explicit values", func() {
-			alphaDep := getAlphaDeployment("alpha-explicit-values")
-			alphaDep.Spec.NodeResources = &corev1.ResourceRequirements{
-				Requests: corev1.ResourceList{
-					corev1.ResourceCPU:    resource.MustParse("10m"),
-					corev1.ResourceMemory: resource.MustParse("25Mi"),
-				},
-				Limits: corev1.ResourceList{
-					corev1.ResourceCPU:    resource.MustParse("100m"),
-					corev1.ResourceMemory: resource.MustParse("50Mi"),
-				},
-			}
-			alphaDep.Spec.ControllerResources = &corev1.ResourceRequirements{
-				Requests: corev1.ResourceList{
-					corev1.ResourceCPU:    resource.MustParse("20m"),
-					corev1.ResourceMemory: resource.MustParse("50Mi"),
+			alphaDep := alphaapi.Deployment{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "explict-values",
 				},
-				Limits: corev1.ResourceList{
-					corev1.ResourceCPU:    resource.MustParse("200m"),
-					corev1.ResourceMemory: resource.MustParse("100Mi"),
+				Spec: alphaapi.DeploymentSpec{
+					Image:              dummyImage,
+					PullPolicy:         corev1.PullAlways,
+					ProvisionerImage:   "no-such-provisioner",
+					NodeRegistrarImage: "no-such-registrar",
+					NodeResources: &corev1.ResourceRequirements{
+						Requests: corev1.ResourceList{
+							corev1.ResourceCPU:    resource.MustParse("10m"),
+							corev1.ResourceMemory: resource.MustParse("25Mi"),
+						},
+						Limits: corev1.ResourceList{
+							corev1.ResourceCPU:    resource.MustParse("100m"),
+							corev1.ResourceMemory: resource.MustParse("50Mi"),
+						},
+					},
+					ControllerResources: &corev1.ResourceRequirements{
+						Requests: corev1.ResourceList{
+							corev1.ResourceCPU:    resource.MustParse("20m"),
+							corev1.ResourceMemory: resource.MustParse("50Mi"),
+						},
+						Limits: corev1.ResourceList{
+							corev1.ResourceCPU:    resource.MustParse("200m"),
+							corev1.ResourceMemory: resource.MustParse("100Mi"),
+						},
+					},
+					DeviceMode:     alphaapi.DeviceModeDirect,
+					LogLevel:       5,
+					NodeSelector:   map[string]string{"no-such-label": "no-such-key"},
+					PMEMPercentage: 99,
+					Labels:         map[string]string{"app": "explicit"},
+					KubeletDir:     "/tmp",
 				},
 			}
 			deploy.CreateAlphaDeploymentCR(f, alphaDep)
@@ -985,14 +1002,32 @@ var _ = deploy.DescribeForSome("API", func(d *deploy.Deployment) bool {
 
 			defer deploy.DeleteDeploymentCR(f, deployment.Name)
 
-			validateDriver(deployment, true)
-
-			// Expect to ruturn alpha object converting from stored beta CR
+			// Expect the same spec to be returned for the
+			// stored CR, regardless of the version that
+			// is used to retrieve it.
 			alphaCR := deploy.GetAlphaDeploymentCR(f, deployment.Name)
-			betaCR := deploy.GetDeploymentCR(f, deployment.Name)
+			cr := deploy.GetDeploymentCR(f, deployment.Name)
 			Expect(alphaCR).ShouldNot(BeNil(), "get alpha CR")
 			Expect(alphaCR.Spec).Should(BeEquivalentTo(alphaDep.Spec), "alpha CR spec mismatch")
-			Expect(alphaCR.Status).Should(BeEquivalentTo(betaCR.Status), "alpha CR status mismatch")
+			Expect(alphaCR.Status).Should(BeEquivalentTo(cr.Status), "status mismatch")
+
+			// We can also compare the full spec by iterating over all fields. Those that have no match
+			// must be blanked out first.
+			// BeEquivalentTo cannot be used here because the structs cannot be converted into each other.
+			alphaDep.Spec.NodeResources = nil
+			alphaDep.Spec.ControllerResources = nil
+			alphaV := reflect.ValueOf(alphaDep.Spec)
+			alphaType := reflect.TypeOf(alphaDep.Spec)
+			v := reflect.ValueOf(cr.Spec)
+			for i := 0; i < alphaType.NumField(); i++ {
+				name := alphaType.Field(i).Name
+				actual := v.FieldByName(name)
+				if actual.Kind() == reflect.Invalid {
+					// Zero value, ignore the field.
+					continue
+				}
+				Expect(actual.Interface()).Should(BeEquivalentTo(alphaV.FieldByName(name).Interface()), "current CR field %s mismatch", name)
+			}
 		})
 	})
 })