From fccff9adb6d19ad9a408fbbf1c62319baa2a7403 Mon Sep 17 00:00:00 2001 From: mbohlool Date: Tue, 30 May 2017 17:06:28 -0700 Subject: [PATCH] Enable OpenAPI definition generation for apiregistration --- .../kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go | 1 + .../kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go index 187178137f9..4560cfa1d10 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go @@ -16,6 +16,7 @@ limitations under the License. // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration +// +k8s:openapi-gen=true // Package v1beta1 contains the API Registration API, which is responsible for // registering an API `Group`/`Version` with another kubernetes like API server. diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go index 6dc64dfb476..80f2520885e 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go @@ -104,6 +104,8 @@ type APIServiceCondition struct { type APIServiceStatus struct { // Current service state of apiService. // +optional + // +patchMergeKey=type + // +patchStrategy=merge Conditions []APIServiceCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` }