Skip to content

Commit e28ae9c

Browse files
authored
Merge pull request kubernetes#85728 from prksu/make-apiservice.spec.service-optional
Make APIService.spec.service optional in the openapi v2 spec
2 parents 0f332ba + e911833 commit e28ae9c

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed

api/openapi-spec/swagger.json

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ type APIServiceSpec struct {
4848
// on port 443
4949
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
5050
// The call will simply delegate to the normal handler chain to be fulfilled.
51+
// +optional
5152
Service *ServiceReference
5253
// Group is the API group name this server hosts
5354
Group string

staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/generated.proto

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ type APIServiceSpec struct {
4848
// on port 443
4949
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
5050
// The call will simply delegate to the normal handler chain to be fulfilled.
51-
Service *ServiceReference `json:"service" protobuf:"bytes,1,opt,name=service"`
51+
// +optional
52+
Service *ServiceReference `json:"service,omitempty" protobuf:"bytes,1,opt,name=service"`
5253
// Group is the API group name this server hosts
5354
Group string `json:"group,omitempty" protobuf:"bytes,2,opt,name=group"`
5455
// Version is the API version this server hosts. For example, "v1"

staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ type APIServiceSpec struct {
4848
// on port 443
4949
// If the Service is nil, that means the handling for the API groupversion is handled locally on this server.
5050
// The call will simply delegate to the normal handler chain to be fulfilled.
51-
Service *ServiceReference `json:"service" protobuf:"bytes,1,opt,name=service"`
51+
// +optional
52+
Service *ServiceReference `json:"service,omitempty" protobuf:"bytes,1,opt,name=service"`
5253
// Group is the API group name this server hosts
5354
Group string `json:"group,omitempty" protobuf:"bytes,2,opt,name=group"`
5455
// Version is the API version this server hosts. For example, "v1"

0 commit comments

Comments
 (0)