Skip to content

Commit

Permalink
apimanager openapi validation remove description
Browse files Browse the repository at this point in the history
  • Loading branch information
eguzki committed May 24, 2019
1 parent 4cb2469 commit 4fbbcaf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ help: Makefile

## vendor: Populate vendor directory
vendor:
go mod vendor
@GO111MODULE=on go mod vendor

IMAGE ?= quay.io/3scale/3scale-operator
SOURCE_VERSION ?= master
Expand Down
7 changes: 0 additions & 7 deletions deploy/crds/apps_v1alpha1_apimanager_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ spec:
system:
properties:
database:
description: TODO should union fields be optional?
properties:
mysql:
description: Union type. Only one of the fields can be set
Expand All @@ -75,12 +74,6 @@ spec:
type: object
type: object
fileStorage:
description: TODO should this field be optional? We have different
approaches in Kubernetes. For example, in v1.Volume it is optional
and there's an implied behaviour on which one is the default VolumeSource
of the ones available. However, on v1.Probe the Handler field
is mandatory and says that one of the available values and only
one should be specified (it mandates to write something)
properties:
amazonSimpleStorageService:
properties:
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/apps/v1alpha1/apimanager_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,12 @@ type SystemSpec struct {
// on v1.Probe the Handler field is mandatory and says that one of the
// available values and only one should be specified (it mandates to write
// something)

// +optional
FileStorageSpec *SystemFileStorageSpec `json:"fileStorage,omitempty"`

// TODO should union fields be optional?

// +optional
DatabaseSpec *SystemDatabaseSpec `json:"database,omitempty"`
}
Expand Down

0 comments on commit 4fbbcaf

Please sign in to comment.