Merge pull request #85728 from prksu/make-apiservice.spec.service-optional

Make APIService.spec.service optional in the openapi v2 spec
This commit is contained in:
Kubernetes Prow Robot 2019-12-03 23:08:57 -08:00 committed by GitHub
commit e28ae9ce09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 4 deletions

View File

@ -20607,7 +20607,6 @@
} }
}, },
"required": [ "required": [
"service",
"groupPriorityMinimum", "groupPriorityMinimum",
"versionPriority" "versionPriority"
], ],
@ -20778,7 +20777,6 @@
} }
}, },
"required": [ "required": [
"service",
"groupPriorityMinimum", "groupPriorityMinimum",
"versionPriority" "versionPriority"
], ],

View File

@ -48,6 +48,7 @@ type APIServiceSpec struct {
// on port 443 // on port 443
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server. // If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
// The call will simply delegate to the normal handler chain to be fulfilled. // The call will simply delegate to the normal handler chain to be fulfilled.
// +optional
Service *ServiceReference Service *ServiceReference
// Group is the API group name this server hosts // Group is the API group name this server hosts
Group string Group string

View File

@ -76,6 +76,7 @@ message APIServiceSpec {
// on port 443 // on port 443
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server. // If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
// The call will simply delegate to the normal handler chain to be fulfilled. // The call will simply delegate to the normal handler chain to be fulfilled.
// +optional
optional ServiceReference service = 1; optional ServiceReference service = 1;
// Group is the API group name this server hosts // Group is the API group name this server hosts

View File

@ -48,7 +48,8 @@ type APIServiceSpec struct {
// on port 443 // on port 443
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server. // If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
// The call will simply delegate to the normal handler chain to be fulfilled. // The call will simply delegate to the normal handler chain to be fulfilled.
Service *ServiceReference `json:"service" protobuf:"bytes,1,opt,name=service"` // +optional
Service *ServiceReference `json:"service,omitempty" protobuf:"bytes,1,opt,name=service"`
// Group is the API group name this server hosts // Group is the API group name this server hosts
Group string `json:"group,omitempty" protobuf:"bytes,2,opt,name=group"` Group string `json:"group,omitempty" protobuf:"bytes,2,opt,name=group"`
// Version is the API version this server hosts. For example, "v1" // Version is the API version this server hosts. For example, "v1"

View File

@ -76,6 +76,7 @@ message APIServiceSpec {
// on port 443 // on port 443
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server. // If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
// The call will simply delegate to the normal handler chain to be fulfilled. // The call will simply delegate to the normal handler chain to be fulfilled.
// +optional
optional ServiceReference service = 1; optional ServiceReference service = 1;
// Group is the API group name this server hosts // Group is the API group name this server hosts

View File

@ -48,7 +48,8 @@ type APIServiceSpec struct {
// on port 443 // on port 443
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server. // If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
// The call will simply delegate to the normal handler chain to be fulfilled. // The call will simply delegate to the normal handler chain to be fulfilled.
Service *ServiceReference `json:"service" protobuf:"bytes,1,opt,name=service"` // +optional
Service *ServiceReference `json:"service,omitempty" protobuf:"bytes,1,opt,name=service"`
// Group is the API group name this server hosts // Group is the API group name this server hosts
Group string `json:"group,omitempty" protobuf:"bytes,2,opt,name=group"` Group string `json:"group,omitempty" protobuf:"bytes,2,opt,name=group"`
// Version is the API version this server hosts. For example, "v1" // Version is the API version this server hosts. For example, "v1"