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

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

info := bindataFileInfo{name: "installer.stash.appscode.com_stashpostgreses.yaml", size: 2561, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
info := bindataFileInfo{name: "installer.stash.appscode.com_stashpostgreses.yaml", size: 2471, 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_stashpostgreses.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.postgres.apis.installer.v1alpha1.PostgresBackup": {
"type": "object",
"required": [
"args"
],
"properties": {
"args": {
"type": "string"
Expand All @@ -898,9 +895,6 @@
},
"dev.appscode.stash.postgres.apis.installer.v1alpha1.PostgresRestore": {
"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_postgres_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ type StashPostgres struct {

// StashPostgresSpec is the schema for Stash Postgres values file
type StashPostgresSpec 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 PostgresBackup `json:"backup" protobuf:"bytes,4,opt,name=backup"`
Expand All @@ -59,10 +59,12 @@ type ImageRef struct {
}

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

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

Expand Down
4 changes: 0 additions & 4 deletions charts/stash-postgres/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 ec94eac

Please sign in to comment.