Skip to content

Commit

Permalink
Correctly mark optional fields
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
tamalsaha committed May 26, 2020
1 parent 86d7264 commit 44be3d5
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 20 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Available platforms
run: echo ${{ steps.buildx.outputs.platforms }}

- name: Run checks
- name: Prepare Host
run: |
sudo apt-get -qq update || true
sudo apt-get install -y bzr
Expand All @@ -44,7 +44,9 @@ jobs:
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl
chmod +x ./kubectl
sudo mv ./kubectl /usr/local/bin/kubectl
# run checks
- name: Run checks
run: |
make ci
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions api/crds/bindata.go
Expand Up @@ -77,7 +77,7 @@ func (fi bindataFileInfo) Sys() interface{} {
return nil
}

var _installerStashAppscodeCom_stashelasticsearchesYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\xdb\x8e\xe4\x34\x10\x7d\xef\xaf\x28\x09\xa4\x05\x44\xd2\x8c\x56\x42\x90\x17\x84\x86\x45\x5a\xb1\x5c\xb4\xbd\xec\xcb\x68\x91\xaa\xed\xea\x74\x31\x8e\x6d\x5c\x95\x66\x67\xbe\x1e\xd9\x49\x7a\xfa\x92\x1e\xd8\x11\x08\x3f\xc5\xc7\xe5\xba\x9c\x53\x65\x05\x23\xbf\xa5\x24\x1c\x7c\x03\x18\x99\xde\x2b\xf9\xbc\x93\xfa\xf6\x2b\xa9\x39\x2c\x77\x57\x6b\x52\xbc\x5a\xdc\xb2\xb7\x0d\x5c\xf7\xa2\xa1\x7b\x4d\x12\xfa\x64\xe8\x3b\xda\xb0\x67\xe5\xe0\x17\x1d\x29\x5a\x54\x6c\x16\x00\x26\x11\x66\xf0\x0d\x77\x24\x8a\x5d\x6c\xc0\xf7\xce\x2d\x00\x1c\xae\xc9\x49\xb6\x01\xc0\x18\x1b\x10\x45\xd9\x2e\x00\x3c\x76\x34\xee\xc8\xa1\x28\x1b\x21\x4c\x66\x4b\x52\xb3\x17\x45\xe7\x28\xd5\xe5\xb8\xc6\x18\xc5\x04\x4b\xb5\x09\xdd\x42\x22\x99\xec\xae\x4d\xa1\x8f\x0d\x3c\x6a\x3b\x44\x19\xa3\x1b\x54\x6a\x43\xe2\x69\x5f\xed\x53\xc9\xdf\xd3\xbd\xb2\x1d\x2a\x5f\xe5\xe3\x17\x87\xb9\x95\x43\xc7\xa2\x3f\x5c\x30\x78\xc5\xa2\xc5\x28\xba\x3e\xa1\x9b\xaf\xaf\x18\x08\xfb\xb6\x77\x98\xe6\x4c\x16\x00\x31\x91\x50\xda\xd1\xaf\xfe\xd6\x87\x3f\xfd\xf7\x4c\xce\x4a\x03\x1b\x74\x92\x53\x14\x13\x22\x35\xf0\x53\xae\x2e\xa2\x21\xbb\x00\xd8\xa1\x63\x5b\x54\x18\xea\x0b\x91\xfc\xb7\xbf\xbc\x7c\xfb\x7c\x65\xb6\xd4\xe1\x00\x66\xcf\x21\x52\xd2\x3d\x0d\x83\x30\xfb\x96\xd8\x63\x00\x96\xc4\x24\x8e\xc5\x23\x3c\xcb\xae\x06\x1b\xb0\xb9\x09\x48\x40\xb7\x04\xbb\x01\x23\x0b\x52\xc2\x40\xd8\x80\x6e\x59\x20\x51\xa9\xc1\x6b\x49\xe9\xc0\x2d\x64\x13\xf4\x10\xd6\xbf\x93\xd1\x1a\x56\xb9\xce\x24\x20\xdb\xd0\x3b\x0b\x26\xf8\x1d\x25\x85\x44\x26\xb4\x9e\xef\xf7\x9e\x05\x34\x94\x90\x0e\x95\x46\x9a\xa7\xc5\x5e\x29\x79\x74\x99\x84\x9e\x3e\x07\xf4\x16\x3a\xbc\x83\x44\x39\x06\xf4\xfe\xc0\x5b\x31\x91\x1a\x7e\x0c\x89\x80\xfd\x26\x34\xb0\x55\x8d\xd2\x2c\x97\x2d\xeb\x34\x04\x26\x74\x5d\xef\x59\xef\x96\x26\x78\x4d\xbc\xee\x35\x24\x59\x5a\xda\x91\x5b\x0a\xb7\x55\x16\x8a\x95\x8c\xf6\x89\x96\x18\xb9\x2a\x89\x7b\x2d\x93\xd4\xd9\x8f\xd2\x38\x31\xf2\xec\x20\x53\xbd\x8b\xa5\xe9\x13\xfb\x76\x0f\x97\x6e\xbb\xc8\x7b\x6e\x35\x60\x01\x1c\xaf\x0d\xf9\x3f\xd0\x9b\xa1\xcc\xca\xeb\x17\xab\x37\x30\x05\x2d\x12\x1c\x73\x5e\xd8\x7e\xb8\x26\x0f\xc4\x67\xa2\xd8\x6f\x28\x0d\xc2\x6d\x52\xe8\x8a\x47\xf2\x36\x06\xf6\x5a\x36\xc6\x31\xf9\x63\xd2\xa5\x5f\x77\xac\x59\xe9\x3f\x7a\x12\xcd\xfa\xd4\x70\x8d\xde\x07\x85\x35\x41\x1f\x2d\x2a\xd9\x1a\x5e\x7a\xb8\xc6\x8e\xdc\x35\x0a\xfd\xe7\xb4\x67\x86\xa5\xca\x94\xfe\x3d\xf1\x87\x2f\xd8\xb4\xe6\xc6\x23\xaf\xf2\x5c\x1d\x21\x00\x1d\xbe\x7f\x45\xbe\xd5\x6d\x03\x5f\x3e\x3f\x39\x8b\xa8\xb9\x25\x1b\xf8\xed\x06\xab\xfb\x77\x9f\xdc\x54\x58\xdd\x7f\x51\x7d\xfd\xee\xb3\x9b\xf1\xe3\xd3\x6f\x3e\x3e\xb9\x33\x9b\xe4\x04\x0f\x02\xee\xe1\xe9\x19\x9c\x6d\x9a\xf3\x87\x69\x15\xc9\xe4\x2e\xca\x52\x8e\x83\xba\x09\x69\x30\x84\xf3\x37\x6e\x5a\xc3\xac\xc0\x86\x1d\xfd\x03\x8e\xd6\x68\x6e\xfb\x78\xca\xd2\x25\xeb\xbc\x30\xb5\x33\xe8\x45\x26\xf2\xca\xdd\xc6\x89\xec\xe9\xb5\xaa\x38\x9b\x65\xf4\x84\xba\xbc\x36\xbd\x73\x59\xd2\x9f\x77\x94\x12\xdb\x33\x69\x2f\x26\xc0\x1d\xb6\x67\xd6\x8f\x95\x98\xa8\x65\xd1\x74\xf7\x81\x65\xe6\x8b\x31\x08\x6b\x78\xc2\x55\xc5\xf6\x5f\x63\x75\xca\x7f\xe6\x60\xca\xef\xec\x48\xf1\xd4\xff\x45\x21\x9e\x24\x42\x22\xd1\x90\x3e\x48\x86\xff\xa9\xd3\xe6\x7c\x54\xe3\xa0\x1c\x41\xa5\xaf\x8e\x90\xb1\xc8\xc7\x1f\x82\x13\x68\x37\xfd\xd8\xed\xae\xd0\xc5\x2d\x5e\x3d\x60\xa5\xfa\x6a\xfc\xed\x3a\x38\x06\x28\x3f\x1a\xb6\x01\x4d\xfd\x10\x2d\xc7\xcd\x5d\x3e\x20\x7f\x05\x00\x00\xff\xff\x89\xb1\xd5\xc4\x30\x0a\x00\x00")
var _installerStashAppscodeCom_stashelasticsearchesYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x6d\x8f\xdc\x34\x10\xfe\xbe\xbf\x62\x24\x90\x0a\x88\x64\x39\x55\x42\x90\x2f\x08\x1d\x45\xaa\x28\x2f\xea\x96\x7e\x39\x15\x69\xd6\x9e\xcd\x0e\xe7\xd8\xc6\x33\x09\xbd\xfb\xf5\xc8\x4e\xb2\xb7\xaf\x47\xaf\x02\x7f\x8a\x1f\xcf\x9b\x9f\x67\xc6\x0a\x46\x7e\x4b\x49\x38\xf8\x06\x30\x32\xbd\x57\xf2\x79\x27\xf5\xed\x37\x52\x73\x58\x0e\x57\x6b\x52\xbc\x5a\xdc\xb2\xb7\x0d\x5c\xf7\xa2\xa1\x7b\x4d\x12\xfa\x64\xe8\x07\xda\xb0\x67\xe5\xe0\x17\x1d\x29\x5a\x54\x6c\x16\x00\x26\x11\x66\xf0\x0d\x77\x24\x8a\x5d\x6c\xc0\xf7\xce\x2d\x00\x1c\xae\xc9\x49\xb6\x01\xc0\x18\x1b\x10\x45\xd9\x2e\x00\x3c\x76\x34\xed\xc8\xa1\x28\x1b\x21\x4c\x66\x4b\x52\xb3\x17\x45\xe7\x28\xd5\xe5\xb8\xc6\x18\xc5\x04\x4b\xb5\x09\xdd\x42\x22\x99\x1c\xae\x4d\xa1\x8f\x0d\x3c\x6a\x3b\x66\x99\xb2\x1b\x54\x6a\x43\xe2\x79\x5f\xed\x4a\xc9\xdf\xb3\x5f\xd9\x8e\x37\x5f\xe5\xe3\x17\xfb\xb5\x95\x43\xc7\xa2\x3f\x5d\x30\x78\xc5\xa2\xc5\x28\xba\x3e\xa1\x3b\x7f\xbf\x62\x20\xec\xdb\xde\x61\x3a\x67\xb2\x00\x88\x89\x84\xd2\x40\xbf\xfb\x5b\x1f\xfe\xf6\x3f\x32\x39\x2b\x0d\x6c\xd0\x49\x2e\x51\x4c\x88\xd4\xc0\x2f\xf9\x76\x11\x0d\xd9\x05\xc0\x80\x8e\x6d\x51\x61\xbc\x5f\x88\xe4\xbf\xff\xed\xe5\xdb\xe7\x2b\xb3\xa5\x0e\x47\x30\x47\x0e\x91\x92\xee\x68\x18\x85\xd9\xb5\xc4\x0e\x03\xb0\x24\x26\x71\x2c\x11\xe1\x59\x0e\x35\xda\x80\xcd\x4d\x40\x02\xba\x25\x18\x46\x8c\x2c\x48\x49\x03\x61\x03\xba\x65\x81\x44\xe5\x0e\x5e\x4b\x49\x7b\x61\x21\x9b\xa0\x87\xb0\xfe\x93\x8c\xd6\xb0\xca\xf7\x4c\x02\xb2\x0d\xbd\xb3\x60\x82\x1f\x28\x29\x24\x32\xa1\xf5\x7c\xbf\x8b\x2c\xa0\xa1\xa4\x74\xa8\x34\xd1\x3c\x2f\xf6\x4a\xc9\xa3\xcb\x24\xf4\xf4\x25\xa0\xb7\xd0\xe1\x1d\x24\xca\x39\xa0\xf7\x7b\xd1\x8a\x89\xd4\xf0\x73\x48\x04\xec\x37\xa1\x81\xad\x6a\x94\x66\xb9\x6c\x59\xe7\x21\x30\xa1\xeb\x7a\xcf\x7a\xb7\x34\xc1\x6b\xe2\x75\xaf\x21\xc9\xd2\xd2\x40\x6e\x29\xdc\x56\x59\x28\x56\x32\xda\x27\x5a\x62\xe4\xaa\x14\xee\xb5\x4c\x52\x67\x3f\x49\xd3\xc4\xc8\xb3\xbd\x4a\xf5\x2e\x96\xa6\x4f\xec\xdb\x1d\x5c\xba\xed\x22\xef\xb9\xd5\x80\x05\x70\x72\x1b\xeb\x7f\xa0\x37\x43\x99\x95\xd7\x2f\x56\x6f\x60\x4e\x5a\x24\x38\xe4\xbc\xb0\xfd\xe0\x26\x0f\xc4\x67\xa2\xd8\x6f\x28\x8d\xc2\x6d\x52\xe8\x4a\x44\xf2\x36\x06\xf6\x5a\x36\xc6\x31\xf9\x43\xd2\xa5\x5f\x77\xac\x59\xe9\xbf\x7a\x12\xcd\xfa\xd4\x70\x8d\xde\x07\x85\x35\x41\x1f\x2d\x2a\xd9\x1a\x5e\x7a\xb8\xc6\x8e\xdc\x35\x0a\xfd\xef\xb4\x67\x86\xa5\xca\x94\xfe\x3b\xf1\xfb\x2f\xd8\xbc\xce\x8d\x47\x5e\xe5\xb9\x3a\x40\x00\x3a\x7c\xff\x8a\x7c\xab\xdb\x06\xbe\x7e\x7e\x74\x16\x51\x73\x4b\x36\xf0\xc7\x0d\x56\xf7\xef\x3e\xbb\xa9\xb0\xba\xff\xaa\xfa\xf6\xdd\x17\x37\xd3\xc7\xe7\xdf\x7d\x7a\xe4\x73\xb6\xc8\x19\x1e\x05\xdc\xc1\xf3\x33\x78\xb6\x69\x4e\x1f\xa6\x55\x24\x93\xbb\x28\x4b\x39\x0d\xea\x26\xa4\xd1\x10\x4e\xdf\xb8\x79\x8d\xb3\x02\x1b\x76\xf4\x01\x1c\xad\xd1\xdc\xf6\xf1\x98\xa5\x4b\xd6\x79\x61\x6a\xcf\xa0\x17\x99\xb8\xc8\x46\x5e\x9b\xde\xb9\xac\xd2\xaf\x03\xa5\xc4\xf6\x44\xad\x8b\x31\xb9\xc3\xf6\xc4\xfa\xb1\xaa\x13\xb5\x2c\x9a\xee\x9e\x58\x79\x76\x8c\x41\x58\xc3\x47\xb8\x2a\xb6\x4f\xf4\xc9\x63\xc9\x89\xec\xb1\x5b\xb5\xab\xff\xcc\xc1\x5c\xdf\xc9\x91\xe2\x07\x0b\xf1\x51\x22\x24\x12\x0d\xe9\x49\x32\xfc\x77\xcd\x73\x8e\xaa\x6a\x6a\xe7\x03\xa8\xb4\xca\x01\x32\xd5\xfd\xf8\xb8\x1e\x41\xc3\xfc\xfb\x35\x5c\xa1\x8b\x5b\xbc\x7a\xc0\xca\x85\xaa\xe9\xe7\x68\xef\x18\xa0\xfc\x0e\xd8\x06\x34\xf5\x63\xb6\x9c\x37\x37\xee\x88\xfc\x13\x00\x00\xff\xff\x3c\x51\xbd\x9e\xd6\x09\x00\x00")

func installerStashAppscodeCom_stashelasticsearchesYamlBytes() ([]byte, error) {
return bindataRead(
Expand All @@ -92,7 +92,7 @@ func installerStashAppscodeCom_stashelasticsearchesYaml() (*asset, error) {
return nil, err
}

info := bindataFileInfo{name: "installer.stash.appscode.com_stashelasticsearches.yaml", size: 2608, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
info := bindataFileInfo{name: "installer.stash.appscode.com_stashelasticsearches.yaml", size: 2518, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down
Expand Up @@ -45,8 +45,6 @@ spec:
properties:
args:
type: string
required:
- args
type: object
fullnameOverride:
type: string
Expand All @@ -69,8 +67,6 @@ spec:
properties:
args:
type: string
required:
- args
type: object
required:
- backup
Expand Down
6 changes: 0 additions & 6 deletions api/openapi-spec/swagger.json
Expand Up @@ -868,9 +868,6 @@
"definitions": {
"dev.appscode.stash.elasticsearch.apis.installer.v1alpha1.ElasticsearchBackup": {
"type": "object",
"required": [
"args"
],
"properties": {
"args": {
"type": "string"
Expand All @@ -879,9 +876,6 @@
},
"dev.appscode.stash.elasticsearch.apis.installer.v1alpha1.ElasticsearchRestore": {
"type": "object",
"required": [
"args"
],
"properties": {
"args": {
"type": "string"
Expand Down
2 changes: 2 additions & 0 deletions apis/installer/v1alpha1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions apis/installer/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions apis/installer/v1alpha1/stash_elasticsearch_types.go
Expand Up @@ -59,10 +59,12 @@ type ImageRef struct {
}

type ElasticsearchBackup struct {
//+optional
Args string `json:"args" protobuf:"bytes,1,opt,name=args"`
}

type ElasticsearchRestore struct {
//+optional
Args string `json:"args" protobuf:"bytes,1,opt,name=args"`
}

Expand Down
4 changes: 0 additions & 4 deletions charts/stash-elasticsearch/values.openapiv3_schema.yaml
Expand Up @@ -3,8 +3,6 @@ properties:
properties:
args:
type: string
required:
- args
type: object
fullnameOverride:
type: string
Expand All @@ -27,8 +25,6 @@ properties:
properties:
args:
type: string
required:
- args
type: object
required:
- backup
Expand Down

0 comments on commit 44be3d5

Please sign in to comment.