Skip to content

Commit 31ff6c4

Browse files
committed
Correctly mark optional fields
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 3676857 commit 31ff6c4

File tree

8 files changed

+17
-23
lines changed

8 files changed

+17
-23
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Available platforms
3333
run: echo ${{ steps.buildx.outputs.platforms }}
3434

35-
- name: Run checks
35+
- name: Prepare Host
3636
run: |
3737
sudo apt-get -qq update || true
3838
sudo apt-get install -y bzr
@@ -44,7 +44,9 @@ jobs:
4444
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl
4545
chmod +x ./kubectl
4646
sudo mv ./kubectl /usr/local/bin/kubectl
47-
# run checks
47+
48+
- name: Run checks
49+
run: |
4850
make ci
4951
5052
- name: Build

api/crds/bindata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (fi bindataFileInfo) Sys() interface{} {
7777
return nil
7878
}
7979

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

8282
func installerStashAppscodeCom_stashperconaxtradbsYamlBytes() ([]byte, error) {
8383
return bindataRead(
@@ -92,7 +92,7 @@ func installerStashAppscodeCom_stashperconaxtradbsYaml() (*asset, error) {
9292
return nil, err
9393
}
9494

95-
info := bindataFileInfo{name: "installer.stash.appscode.com_stashperconaxtradbs.yaml", size: 2966, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
95+
info := bindataFileInfo{name: "installer.stash.appscode.com_stashperconaxtradbs.yaml", size: 2873, mode: os.FileMode(420), modTime: time.Unix(1573722179, 0)}
9696
a := &asset{bytes: bytes, info: info}
9797
return a, nil
9898
}

api/crds/installer.stash.appscode.com_stashperconaxtradbs.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ spec:
4848
socatRetry:
4949
format: int32
5050
type: integer
51-
required:
52-
- args
53-
- socatRetry
5451
type: object
5552
fullnameOverride:
5653
type: string
@@ -80,7 +77,6 @@ spec:
8077
format: int32
8178
type: integer
8279
required:
83-
- args
8480
- targetAppReplicas
8581
type: object
8682
required:

api/openapi-spec/swagger.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,6 @@
887887
},
888888
"dev.appscode.stash.percona-xtradb.apis.installer.v1alpha1.PerconaXtraDBBackup": {
889889
"type": "object",
890-
"required": [
891-
"args",
892-
"socatRetry"
893-
],
894890
"properties": {
895891
"args": {
896892
"type": "string"
@@ -904,7 +900,6 @@
904900
"dev.appscode.stash.percona-xtradb.apis.installer.v1alpha1.PerconaXtraDBRestore": {
905901
"type": "object",
906902
"required": [
907-
"args",
908903
"targetAppReplicas"
909904
],
910905
"properties": {

apis/installer/v1alpha1/generated.proto

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

apis/installer/v1alpha1/openapi_generated.go

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

apis/installer/v1alpha1/stash_perconaxtradb_types.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ type StashPerconaXtraDB struct {
4343

4444
// StashPerconaXtraDBSpec is the schema for Stash Percona XtraDB values file
4545
type StashPerconaXtraDBSpec struct {
46-
//+optional
46+
// +optional
4747
NameOverride string `json:"nameOverride" protobuf:"bytes,1,opt,name=nameOverride"`
48-
//+optional
48+
// +optional
4949
FullnameOverride string `json:"fullnameOverride" protobuf:"bytes,2,opt,name=fullnameOverride"`
5050
ReplicaCount int32 `json:"replicaCount" protobuf:"varint,3,opt,name=replicaCount"`
5151
Image ImageRef `json:"image" protobuf:"bytes,4,opt,name=image"`
@@ -60,11 +60,14 @@ type ImageRef struct {
6060
}
6161

6262
type PerconaXtraDBBackup struct {
63-
Args string `json:"args" protobuf:"bytes,1,opt,name=args"`
64-
SocatRetry int32 `json:"socatRetry" protobuf:"varint,2,opt,name=socatRetry"`
63+
// +optional
64+
Args string `json:"args" protobuf:"bytes,1,opt,name=args"`
65+
// +optional
66+
SocatRetry int32 `json:"socatRetry" protobuf:"varint,2,opt,name=socatRetry"`
6567
}
6668

6769
type PerconaXtraDBRestore struct {
70+
// +optional
6871
Args string `json:"args" protobuf:"bytes,1,opt,name=args"`
6972
TargetAppReplicas int32 `json:"targetAppReplicas" protobuf:"varint,2,opt,name=targetAppReplicas"`
7073
}

charts/stash-percona-xtradb/values.openapiv3_schema.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ properties:
66
socatRetry:
77
format: int32
88
type: integer
9-
required:
10-
- args
11-
- socatRetry
129
type: object
1310
fullnameOverride:
1411
type: string
@@ -38,7 +35,6 @@ properties:
3835
format: int32
3936
type: integer
4037
required:
41-
- args
4238
- targetAppReplicas
4339
type: object
4440
required:

0 commit comments

Comments
 (0)