Unverified Commit d89d0d91 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #68360 from dims/attempt-to-fix-conversion-gen-issues-with-imports-that-are-same

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. 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 **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents e5f55dd9 95c70ff6
...@@ -21,6 +21,8 @@ limitations under the License. ...@@ -21,6 +21,8 @@ limitations under the License.
// +k8s:deepcopy-gen=package // +k8s:deepcopy-gen=package
// +k8s:conversion-gen=k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config // +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:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1
// +k8s:openapi-gen=true // +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen=TypeMeta
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment