Resolve Michelle's review comments

Signed-off-by: Nic Jackson <[email protected]>

pkg/apis/access/v1alpha1/traffic_target_convert.go

@@ -20,7 +20,7 @@ the hub version.
 ConvertTo is expected to modify its argument to contain the converted object.
 Most of the conversion is straightforward copying, except for converting our changed field.
 */
-// ConvertTo converts this CronJob to the Hub version (v1).
+// ConvertTo converts this TrafficTarget to the Hub version (v1alpha3).
 func (src *TrafficTarget) ConvertTo(dstRaw conversion.Hub) error {
 	traffictargetlog.Info("ConvertTo v1alpha3 from v1alpha1")
 
@@ -66,9 +66,9 @@ ConvertFrom is expected to modify its receiver to contain the converted object.
 Most of the conversion is straightforward copying, except for converting our changed field.
 */
 
-// ConvertFrom converts from the Hub version (v1) to this version.
+// ConvertFrom converts from the Hub version (v1alpha3) to this version.
 func (dst *TrafficTarget) ConvertFrom(srcRaw conversion.Hub) error {
-	traffictargetlog.Info("ConvertFrom v1alpha1 to v1alpha3")
+	traffictargetlog.Info("ConvertFrom v1alpha3 to v1alpha1")
 
 	src := srcRaw.(*v1alpha3.TrafficTarget)
 	dst.ObjectMeta = src.ObjectMeta

pkg/apis/access/v1alpha2/traffic_target_convert.go

@@ -20,9 +20,9 @@ the hub version.
 ConvertTo is expected to modify its argument to contain the converted object.
 Most of the conversion is straightforward copying, except for converting our changed field.
 */
-// ConvertTo converts this TrafficTarget to the Hub version (v3).
+// ConvertTo converts this TrafficTarget to the Hub version (v1alpha3).
 func (src *TrafficTarget) ConvertTo(dstRaw conversion.Hub) error {
-	traffictargetlog.Info("ConvertTo v1alpha3 from v1alpha1")
+	traffictargetlog.Info("ConvertTo v1alpha3 from v1alpha2")
 
 	dst := dstRaw.(*v1alpha3.TrafficTarget)
 	dst.ObjectMeta = src.ObjectMeta
@@ -66,9 +66,9 @@ ConvertFrom is expected to modify its receiver to contain the converted object.
 Most of the conversion is straightforward copying, except for converting our changed field.
 */
 
-// ConvertFrom converts from the Hub version (v1) to this version.
+// ConvertFrom converts from the Hub version (v1alpha3) to this version.
 func (dst *TrafficTarget) ConvertFrom(srcRaw conversion.Hub) error {
-	traffictargetlog.Info("ConvertFrom v1alpha1 to v1alpha3")
+	traffictargetlog.Info("ConvertFrom v1alpha3 to v1alpha2")
 
 	src := srcRaw.(*v1alpha3.TrafficTarget)
 	dst.ObjectMeta = src.ObjectMeta

pkg/apis/split/v1alpha1/traffic_split_convert.go

@@ -21,13 +21,16 @@ the hub version.
 ConvertTo is expected to modify its argument to contain the converted object.
 Most of the conversion is straightforward copying, except for converting our changed field.
 */
-// ConvertTo converts this CronJob to the Hub version (v1).
+// ConvertTo converts this TrafficSplit to the Hub version (v1alpha4).
 func (src *TrafficSplit) ConvertTo(dstRaw conversion.Hub) error {
 	traffictargetlog.Info("ConvertTo v1alpha4 from v1alpha1")
 
 	dst := dstRaw.(*v1alpha4.TrafficSplit)
 	dst.ObjectMeta = src.ObjectMeta
 
+	dst.TypeMeta = src.TypeMeta
+	dst.APIVersion = "v1alpha4"
+
 	dst.Spec = v1alpha4.TrafficSplitSpec{
 		Service: src.Spec.Service,
 	}
@@ -54,13 +57,16 @@ ConvertFrom is expected to modify its receiver to contain the converted object.
 Most of the conversion is straightforward copying, except for converting our changed field.
 */
 
-// ConvertFrom converts from the Hub version (v1) to this version.
+// ConvertFrom converts from the Hub version (v1alpha4) to this version.
 func (dst *TrafficSplit) ConvertFrom(srcRaw conversion.Hub) error {
 	traffictargetlog.Info("ConvertFrom v1alpha1 to v1alpha4")
 
 	src := srcRaw.(*v1alpha4.TrafficSplit)
 	dst.ObjectMeta = src.ObjectMeta
 
+	dst.TypeMeta = src.TypeMeta
+	dst.APIVersion = "v1alpha1"
+
 	dst.Spec = TrafficSplitSpec{
 		Service: src.Spec.Service,
 	}

pkg/apis/split/v1alpha1/traffic_split_convert_test.go

@@ -26,6 +26,10 @@ func TestConvertToConvertsToAlpha1FromAlpha4(t *testing.T) {
 	err := v1Test.ConvertFrom(v4Split)
 	assert.NoError(t, err)
 
+	assert.Equal(t, v4Split.ObjectMeta, v1Test.ObjectMeta)
+	assert.Equal(t, v4Split.TypeMeta.Kind, v1Test.TypeMeta.Kind)
+	assert.Equal(t, "v1alpha1", v1Test.TypeMeta.APIVersion)
+
 	assert.Equal(t, v4Split.Spec.Service, v1Test.Spec.Service)
 
 	assert.Len(t, v1Test.Spec.Backends, len(v4Split.Spec.Backends))
@@ -45,6 +49,10 @@ func TestConvertToConvertsFromAlpha1ToAlpha4(t *testing.T) {
 	err := v1Test.ConvertTo(&v4Test)
 	assert.NoError(t, err)
 
+	assert.Equal(t, v1Test.ObjectMeta, v4Test.ObjectMeta)
+	assert.Equal(t, v1Test.TypeMeta.Kind, v4Test.TypeMeta.Kind)
+	assert.Equal(t, "v1alpha4", v4Test.TypeMeta.APIVersion)
+
 	assert.Equal(t, v1Test.Spec.Service, v4Test.Spec.Service)
 
 	assert.Len(t, v4Test.Spec.Backends, len(v1Test.Spec.Backends))

pkg/apis/split/v1alpha2/traffic_split_convert.go

@@ -27,6 +27,9 @@ func (src *TrafficSplit) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*v1alpha4.TrafficSplit)
 	dst.ObjectMeta = src.ObjectMeta
 
+	dst.TypeMeta = src.TypeMeta
+	dst.APIVersion = "v1alpha4"
+
 	dst.Spec = v1alpha4.TrafficSplitSpec{
 		Service: src.Spec.Service,
 	}
@@ -58,6 +61,9 @@ func (dst *TrafficSplit) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*v1alpha4.TrafficSplit)
 	dst.ObjectMeta = src.ObjectMeta
 
+	dst.TypeMeta = src.TypeMeta
+	dst.APIVersion = "v1alpha2"
+
 	dst.Spec = TrafficSplitSpec{
 		Service: src.Spec.Service,
 	}

pkg/apis/split/v1alpha2/traffic_split_convert_test.go

@@ -14,6 +14,10 @@ func TestConvertToConvertsFromAlpha4ToAlpha2(t *testing.T) {
 	err := v2Test.ConvertFrom(v4Split)
 	assert.NoError(t, err)
 
+	assert.Equal(t, v2Test.ObjectMeta, v4Split.ObjectMeta)
+	assert.Equal(t, v2Test.TypeMeta.Kind, v4Split.TypeMeta.Kind)
+	assert.Equal(t, "v1alpha2", v2Test.TypeMeta.APIVersion)
+
 	assert.Equal(t, v4Split.Spec.Service, v2Test.Spec.Service)
 
 	assert.Len(t, v4Split.Spec.Backends, len(v2Test.Spec.Backends))
@@ -30,6 +34,10 @@ func TestConvertToConvertsToAlpha4FromAlpha2(t *testing.T) {
 	err := v2Split.ConvertTo(v4Test)
 	assert.NoError(t, err)
 
+	assert.Equal(t, v4Test.ObjectMeta, v2Split.ObjectMeta)
+	assert.Equal(t, v4Test.TypeMeta.Kind, v2Split.TypeMeta.Kind)
+	assert.Equal(t, "v1alpha4", v4Test.TypeMeta.APIVersion)
+
 	assert.Equal(t, v2Split.Spec.Service, v4Test.Spec.Service)
 
 	assert.Len(t, v2Split.Spec.Backends, len(v4Test.Spec.Backends))

pkg/apis/split/v1alpha3/traffic_split_convert.go

@@ -27,6 +27,9 @@ func (src *TrafficSplit) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*v1alpha4.TrafficSplit)
 	dst.ObjectMeta = src.ObjectMeta
 
+	dst.TypeMeta = src.TypeMeta
+	dst.APIVersion = "v1alpha4"
+
 	dst.Spec = v1alpha4.TrafficSplitSpec{
 		Service: src.Spec.Service,
 	}
@@ -60,6 +63,9 @@ func (dst *TrafficSplit) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*v1alpha4.TrafficSplit)
 	dst.ObjectMeta = src.ObjectMeta
 
+	dst.TypeMeta = src.TypeMeta
+	dst.APIVersion = "v1alpha3"
+
 	dst.Spec = TrafficSplitSpec{
 		Service: src.Spec.Service,
 	}

pkg/apis/split/v1alpha3/traffic_split_convert_test.go

@@ -14,6 +14,10 @@ func TestConvertToConvertsFromAlpha4ToAlpha3(t *testing.T) {
 	err := v3Test.ConvertFrom(v4Split)
 	assert.NoError(t, err)
 
+	assert.Equal(t, v3Test.ObjectMeta, v4Split.ObjectMeta)
+	assert.Equal(t, v3Test.TypeMeta.Kind, v4Split.TypeMeta.Kind)
+	assert.Equal(t, "v1alpha3", v3Test.TypeMeta.APIVersion)
+
 	assert.Equal(t, v4Split.Spec.Service, v3Test.Spec.Service)
 
 	assert.Len(t, v4Split.Spec.Backends, len(v3Test.Spec.Backends))
@@ -36,6 +40,10 @@ func TestConvertToConvertsToAlpha4FromAlpha3(t *testing.T) {
 	err := v3Split.ConvertTo(v4Test)
 	assert.NoError(t, err)
 
+	assert.Equal(t, v4Test.ObjectMeta, v3Split.ObjectMeta)
+	assert.Equal(t, v4Test.TypeMeta.Kind, v3Split.TypeMeta.Kind)
+	assert.Equal(t, "v1alpha4", v4Test.TypeMeta.APIVersion)
+
 	assert.Equal(t, v3Split.Spec.Service, v4Test.Spec.Service)
 
 	assert.Len(t, v3Split.Spec.Backends, len(v4Test.Spec.Backends))