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 <[email protected]>
  • Loading branch information
tamalsaha committed May 26, 2020
1 parent 0d30048 commit cb99aeb
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 22 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (fi bindataFileInfo) Sys() interface{} {
return nil
}

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

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

info := bindataFileInfo{name: "installer.stash.appscode.com_stashmysqls.yaml", size: 2538, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
info := bindataFileInfo{name: "installer.stash.appscode.com_stashmysqls.yaml", size: 2448, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
Expand Down
4 changes: 0 additions & 4 deletions api/crds/installer.stash.appscode.com_stashmysqls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ spec:
properties:
args:
type: string
required:
- args
type: object
fullnameOverride:
type: string
Expand All @@ -68,8 +66,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
Original file line number Diff line number Diff line change
Expand Up @@ -887,9 +887,6 @@
},
"dev.appscode.stash.mysql.apis.installer.v1alpha1.MySQLBackup": {
"type": "object",
"required": [
"args"
],
"properties": {
"args": {
"type": "string"
Expand All @@ -898,9 +895,6 @@
},
"dev.appscode.stash.mysql.apis.installer.v1alpha1.MySQLRestore": {
"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.

6 changes: 4 additions & 2 deletions apis/installer/v1alpha1/stash_mysql_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ type StashMySQL struct {

// StashMySQLSpec is the schema for Stash MySQL values file
type StashMySQLSpec struct {
//+optional
// +optional
NameOverride string `json:"nameOverride" protobuf:"bytes,1,opt,name=nameOverride"`
//+optional
// +optional
FullnameOverride string `json:"fullnameOverride" protobuf:"bytes,2,opt,name=fullnameOverride"`
Image ImageRef `json:"image" protobuf:"bytes,3,opt,name=image"`
Backup MySQLBackup `json:"backup" protobuf:"bytes,4,opt,name=backup"`
Expand All @@ -59,10 +59,12 @@ type ImageRef struct {
}

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

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

Expand Down
4 changes: 0 additions & 4 deletions charts/stash-mysql/values.openapiv3_schema.yaml
Original file line number Diff line number Diff line change
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 cb99aeb

Please sign in to comment.