From 63f5a46d7e3f009b658f835d899b4600e20bc8e6 Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Tue, 17 Dec 2019 14:59:51 +0100 Subject: [PATCH 1/2] Use the correct type for UpgradableFrom. --- pkg/apis/kudo/v1beta1/operatorversion_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apis/kudo/v1beta1/operatorversion_types.go b/pkg/apis/kudo/v1beta1/operatorversion_types.go index be471d99f..64b4f8b40 100644 --- a/pkg/apis/kudo/v1beta1/operatorversion_types.go +++ b/pkg/apis/kudo/v1beta1/operatorversion_types.go @@ -45,7 +45,7 @@ type OperatorVersionSpec struct { Dependencies []OperatorDependency `json:"dependencies,omitempty"` // UpgradableFrom lists all OperatorVersions that can upgrade to this OperatorVersion. - UpgradableFrom []OperatorVersion `json:"upgradableFrom,omitempty"` + UpgradableFrom []corev1.ObjectReference `json:"upgradableFrom,omitempty"` } // Ordering specifies how the subitems in this plan/phase should be rolled out. From 2ebcc6c14b769cdfeb454b5c26e304dfc0528087 Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Tue, 17 Dec 2019 15:25:22 +0100 Subject: [PATCH 2/2] re-gen --- pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go b/pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go index e55cc3558..6bab428d1 100644 --- a/pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/kudo/v1beta1/zz_generated.deepcopy.go @@ -19,6 +19,7 @@ limitations under the License. package v1beta1 import ( + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -440,10 +441,8 @@ func (in *OperatorVersionSpec) DeepCopyInto(out *OperatorVersionSpec) { } if in.UpgradableFrom != nil { in, out := &in.UpgradableFrom, &out.UpgradableFrom - *out = make([]OperatorVersion, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } + *out = make([]v1.ObjectReference, len(*in)) + copy(*out, *in) } return }