Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add appVersion and version to CRD to match the structs. #1195

Merged
merged 1 commit into from
Dec 18, 2019
Merged

Add appVersion and version to CRD to match the structs. #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/crds/kudo_v1beta1_operatorversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ spec:
type: object
spec:
properties:
appVersion:
type: string
connectionString:
description: ConnectionString defines a templated string that can be
used to connect to an instance of the Operator.
Expand Down Expand Up @@ -87,6 +89,8 @@ spec:
items:
type: object
type: array
version:
type: string
type: object
status:
type: object
Expand Down
4 changes: 4 additions & 0 deletions pkg/kudoctl/cmd/testdata/deploy-kudo-ns.yaml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ spec:
type: object
spec:
properties:
appVersion:
type: string
connectionString:
description: ConnectionString defines a templated string that can be
used to connect to an instance of the Operator.
Expand Down Expand Up @@ -144,6 +146,8 @@ spec:
items:
type: object
type: array
version:
type: string
type: object
status:
type: object
Expand Down
4 changes: 4 additions & 0 deletions pkg/kudoctl/cmd/testdata/deploy-kudo-sa.yaml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ spec:
type: object
spec:
properties:
appVersion:
type: string
connectionString:
description: ConnectionString defines a templated string that can be
used to connect to an instance of the Operator.
Expand Down Expand Up @@ -144,6 +146,8 @@ spec:
items:
type: object
type: array
version:
type: string
type: object
status:
type: object
Expand Down
4 changes: 4 additions & 0 deletions pkg/kudoctl/cmd/testdata/deploy-kudo-webhook.yaml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ spec:
type: object
spec:
properties:
appVersion:
type: string
connectionString:
description: ConnectionString defines a templated string that can be
used to connect to an instance of the Operator.
Expand Down Expand Up @@ -144,6 +146,8 @@ spec:
items:
type: object
type: array
version:
type: string
type: object
status:
type: object
Expand Down
4 changes: 4 additions & 0 deletions pkg/kudoctl/cmd/testdata/deploy-kudo.yaml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ spec:
type: object
spec:
properties:
appVersion:
type: string
connectionString:
description: ConnectionString defines a templated string that can be
used to connect to an instance of the Operator.
Expand Down Expand Up @@ -144,6 +146,8 @@ spec:
items:
type: object
type: array
version:
type: string
type: object
status:
type: object
Expand Down
2 changes: 2 additions & 0 deletions pkg/kudoctl/kudoinit/crd/crds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ func operatorVersionCrd() *apiextv1beta1.CustomResourceDefinition {
"spec": {Type: "object"},
}
specProps := map[string]apiextv1beta1.JSONSchemaProps{
"appVersion": {Type: "string"},
"connectionString": {Type: "string", Description: "ConnectionString defines a templated string that can be used to connect to an instance of the Operator."},
"operator": {Type: "object"},
"parameters": {
Expand All @@ -191,6 +192,7 @@ func operatorVersionCrd() *apiextv1beta1.CustomResourceDefinition {
Items: &apiextv1beta1.JSONSchemaPropsOrArray{Schema: &apiextv1beta1.JSONSchemaProps{Type: "object"}, JSONSchemas: []apiextv1beta1.JSONSchemaProps{}},
},
"crdVersion": {Type: "string"},
"version": {Type: "string"},
}

validationProps := map[string]apiextv1beta1.JSONSchemaProps{
Expand Down