Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1844495: TagEvent and TagEventCondition conversions #119

Merged
merged 1 commit into from Aug 3, 2020
Merged

Bug 1844495: TagEvent and TagEventCondition conversions #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 69 additions & 3 deletions pkg/image/apis/image/test/conversion_test.go
View file
Open in desktop
Expand Up @@ -3,9 +3,13 @@ package v1
import (
"reflect"
"testing"
"time"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/core"

"github.com/openshift/api/image/v1"
newer "github.com/openshift/openshift-apiserver/pkg/image/apis/image"
Expand All @@ -14,14 +18,76 @@ import (
)

func TestImageStreamStatusConversionPreservesTags(t *testing.T) {
now := time.Now()

in := &newer.ImageStreamStatus{
Tags: map[string]newer.TagEventList{
"v3.5.0": {},
"3.5.0": {},
"v3.5.0": {
Conditions: []newer.TagEventCondition{
{
Type: newer.ImportSuccess,
Status: core.ConditionTrue,
LastTransitionTime: metav1.NewTime(now),
Reason: "reason",
Message: "message",
Generation: 2,
},
{
Type: newer.ImportSuccess,
Status: core.ConditionFalse,
LastTransitionTime: metav1.NewTime(now),
Reason: "no-reason",
Message: "error",
Generation: 4,
},
},
Items: []newer.TagEvent{
{
Created: metav1.NewTime(now),
DockerImageReference: "xyz",
Image: "abc",
Generation: 64,
},
},
},
"3.5.0": {},
},
}
expOutVersioned := &v1.ImageStreamStatus{
Tags: []v1.NamedTagEventList{{Tag: "3.5.0"}, {Tag: "v3.5.0"}},
Tags: []v1.NamedTagEventList{
{
Tag: "3.5.0",
},
{
Tag: "v3.5.0",
Conditions: []v1.TagEventCondition{
{
Type: v1.ImportSuccess,
Status: corev1.ConditionTrue,
LastTransitionTime: metav1.NewTime(now),
Reason: "reason",
Message: "message",
Generation: 2,
},
{
Type: v1.ImportSuccess,
Status: corev1.ConditionFalse,
LastTransitionTime: metav1.NewTime(now),
Reason: "no-reason",
Message: "error",
Generation: 4,
},
},
Items: []v1.TagEvent{
{
Created: metav1.NewTime(now),
DockerImageReference: "xyz",
Image: "abc",
Generation: 64,
},
},
},
},
}

outVersioned := v1.ImageStreamStatus{Tags: []v1.NamedTagEventList{}}
Expand Down
64 changes: 64 additions & 0 deletions pkg/image/apis/image/v1/conversion.go
View file
Open in desktop
Expand Up @@ -192,6 +192,50 @@ func Convert_image_ImageStreamStatus_To_v1_ImageStreamStatus(in *newer.ImageStre
return s.Convert(&in.Tags, &out.Tags, 0)
}

func Convert_image_TagEventConditionArray_to_v1_TagEventConditionArray(in *[]newer.TagEventCondition, out *[]v1.TagEventCondition, s conversion.Scope) error {
for _, o := range *in {
n := v1.TagEventCondition{}
if err := Convert_image_TagEventCondition_To_v1_TagEventCondition(&o, &n, s); err != nil {
return err
}
*out = append(*out, n)
}
return nil
}

func Convert_v1_TagEventConditionArray_to_image_TagEventConditionArray(in *[]v1.TagEventCondition, out *[]newer.TagEventCondition, s conversion.Scope) error {
for _, o := range *in {
n := newer.TagEventCondition{}
if err := Convert_v1_TagEventCondition_To_image_TagEventCondition(&o, &n, s); err != nil {
return err
}
*out = append(*out, n)
}
return nil
}

func Convert_image_TagEventArray_to_v1_TagEventArray(in *[]newer.TagEvent, out *[]v1.TagEvent, s conversion.Scope) error {
for _, o := range *in {
n := v1.TagEvent{}
if err := Convert_image_TagEvent_To_v1_TagEvent(&o, &n, s); err != nil {
return err
}
*out = append(*out, n)
}
return nil
}

func Convert_v1_TagEventArray_to_image_TagEventArray(in *[]v1.TagEvent, out *[]newer.TagEvent, s conversion.Scope) error {
for _, o := range *in {
n := newer.TagEvent{}
if err := Convert_v1_TagEvent_To_image_TagEvent(&o, &n, s); err != nil {
return err
}
*out = append(*out, n)
}
return nil
}

func Convert_v1_NamedTagEventListArray_to_api_TagEventListArray(in *[]v1.NamedTagEventList, out *map[string]newer.TagEventList, s conversion.Scope) error {
for _, curr := range *in {
newTagEventList := newer.TagEventList{}
Expand Down Expand Up @@ -258,6 +302,26 @@ func Convert_image_TagReferenceMap_to_v1_TagReferenceArray(in *map[string]newer.
}

func AddConversionFuncs(s *runtime.Scheme) error {
if err := s.AddConversionFunc((*[]newer.TagEventCondition)(nil), (*[]v1.TagEventCondition)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_image_TagEventConditionArray_to_v1_TagEventConditionArray(a.(*[]newer.TagEventCondition), b.(*[]v1.TagEventCondition), scope)
}); err != nil {
return err
}
if err := s.AddConversionFunc((*[]v1.TagEventCondition)(nil), (*[]newer.TagEventCondition)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1_TagEventConditionArray_to_image_TagEventConditionArray(a.(*[]v1.TagEventCondition), b.(*[]newer.TagEventCondition), scope)
}); err != nil {
return err
}
if err := s.AddConversionFunc((*[]newer.TagEvent)(nil), (*[]v1.TagEvent)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_image_TagEventArray_to_v1_TagEventArray(a.(*[]newer.TagEvent), b.(*[]v1.TagEvent), scope)
}); err != nil {
return err
}
if err := s.AddConversionFunc((*[]v1.TagEvent)(nil), (*[]newer.TagEvent)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1_TagEventArray_to_image_TagEventArray(a.(*[]v1.TagEvent), b.(*[]newer.TagEvent), scope)
}); err != nil {
return err
}
if err := s.AddConversionFunc((*[]v1.NamedTagEventList)(nil), (*map[string]newer.TagEventList)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1_NamedTagEventListArray_to_api_TagEventListArray(a.(*[]v1.NamedTagEventList), b.(*map[string]newer.TagEventList), scope)
}); err != nil {
Expand Down