public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sync CRD with example manifests (#1869)

This commit is contained in:
Felix Kunde 2022-04-25 18:16:05 +02:00 committed by GitHub
parent 8b6664f1a2
commit 9eb7517218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
charts/postgres-operator/crds/postgresqls.yaml
View File

@ -479,7 +479,6 @@ spec:
- standby_host - standby_host
streams: streams:
type: array type: array
nullable: true
items: items:
type: object type: object
required: required:
@ -588,12 +587,12 @@ spec:
- SUPERUSER - SUPERUSER
- nosuperuser - nosuperuser
- NOSUPERUSER - NOSUPERUSER
usersWithPasswordRotation: usersWithInPlaceSecretRotation:
type: array type: array
nullable: true nullable: true
items: items:
type: string type: string
usersWithInPlacePasswordRotation: usersWithSecretRotation:
type: array type: array
nullable: true nullable: true
items: items:
@ -612,17 +611,26 @@ spec:
type: array type: array
items: items:
type: object type: object
required:
- key
- operator
properties: properties:
key: key:
type: string type: string
operator: operator:
type: string type: string
enum:
- DoesNotExists
- Exists
- In
- NotIn
values: values:
type: array type: array
items: items:
type: string type: string
matchLabels: matchLabels:
type: object type: object
x-kubernetes-preserve-unknown-fields: true
size: size:
type: string type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$' pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'

14
manifests/postgresql.crd.yaml
View File

@ -477,7 +477,6 @@ spec:
- standby_host - standby_host
streams: streams:
type: array type: array
nullable: true
items: items:
type: object type: object
required: required:
@ -586,12 +585,12 @@ spec:
- SUPERUSER - SUPERUSER
- nosuperuser - nosuperuser
- NOSUPERUSER - NOSUPERUSER
usersWithPasswordRotation: usersWithInPlaceSecretRotation:
type: array type: array
nullable: true nullable: true
items: items:
type: string type: string
usersWithInPlacePasswordRotation: usersWithSecretRotation:
type: array type: array
nullable: true nullable: true
items: items:
@ -610,17 +609,26 @@ spec:
type: array type: array
items: items:
type: object type: object
required:
- key
- operator
properties: properties:
key: key:
type: string type: string
operator: operator:
type: string type: string
enum:
- DoesNotExists
- Exists
- In
- NotIn
values: values:
type: array type: array
items: items:
type: string type: string
matchLabels: matchLabels:
type: object type: object
x-kubernetes-preserve-unknown-fields: true
size: size:
type: string type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$' pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'

16
pkg/apis/acid.zalan.do/v1/crds.go
View File

@ -957,7 +957,7 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
}, },
}, },
}, },
"usersWithSecretRotation": { "usersWithInPlaceSecretRotation": {
Type: "array", Type: "array",
Nullable: true, Nullable: true,
Items: &apiextv1.JSONSchemaPropsOrArray{ Items: &apiextv1.JSONSchemaPropsOrArray{
@ -966,7 +966,7 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
}, },
}, },
}, },
"usersWithInPlaceSecretRotation": { "usersWithSecretRotation": {
Type: "array", Type: "array",
Nullable: true, Nullable: true,
Items: &apiextv1.JSONSchemaPropsOrArray{ Items: &apiextv1.JSONSchemaPropsOrArray{
@ -990,7 +990,7 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
Items: &apiextv1.JSONSchemaPropsOrArray{ Items: &apiextv1.JSONSchemaPropsOrArray{
Schema: &apiextv1.JSONSchemaProps{ Schema: &apiextv1.JSONSchemaProps{
Type: "object", Type: "object",
Required: []string{"key", "operator", "values"}, Required: []string{"key", "operator"},
Properties: map[string]apiextv1.JSONSchemaProps{ Properties: map[string]apiextv1.JSONSchemaProps{
"key": { "key": {
Type: "string", Type: "string",
@ -999,16 +999,16 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
Type: "string", Type: "string",
Enum: []apiextv1.JSON{ Enum: []apiextv1.JSON{
{ {
Raw: []byte(`"In"`), Raw: []byte(`"DoesNotExist"`),
},
{
Raw: []byte(`"NotIn"`),
}, },
{ {
Raw: []byte(`"Exists"`), Raw: []byte(`"Exists"`),
}, },
{ {
Raw: []byte(`"DoesNotExist"`), Raw: []byte(`"In"`),
},
{
Raw: []byte(`"NotIn"`),
}, },
}, },
}, },