From 95c70ff6f06e0c4cd0dc192aad80b0fe362ffe8d Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 6 Sep 2018 09:51:48 -0400 Subject: [PATCH] conversion-gen issues with import that are exactly the same Technically we don't need this. the instruction below: ``` // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1 ``` registers the apiserver/apimachinery packages in the "package universe" of the conversion-gen program per comment from lucas in PR 68233 However it looks like some files that use both packages run into trouble and causes failures in CI harness. Attempting here to see if we fix the order by specifying them explicitly helps. Change-Id: I20e9c9256f0b7ffdf4e2101d0ca1fe5090e51344 --- cmd/cloud-controller-manager/app/apis/config/v1alpha1/doc.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/doc.go b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/doc.go index 469b6081f6e..1779b1fad0e 100644 --- a/cmd/cloud-controller-manager/app/apis/config/v1alpha1/doc.go +++ b/cmd/cloud-controller-manager/app/apis/config/v1alpha1/doc.go @@ -21,6 +21,8 @@ limitations under the License. // +k8s:deepcopy-gen=package // +k8s:conversion-gen=k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config +// +k8s:conversion-gen=k8s.io/apimachinery/pkg/apis/config/v1alpha1 +// +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/config/v1alpha1 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1 // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta