enable validation and extend doc reference

This commit is contained in:
Felix Kunde 2020-07-31 10:02:12 +02:00
parent d5b7c94ba3
commit 998279a25f
4 changed files with 79 additions and 3 deletions

View File

@ -131,6 +131,26 @@ spec:
type: boolean type: boolean
infrastructure_roles_secret_name: infrastructure_roles_secret_name:
type: string type: string
infrastructure_roles_secrets:
type: array
nullable: true
items:
type: object
required:
- secretname
properties:
secretname:
type: string
name:
type: string
password:
type: string
role:
type: string
details:
type: string
template:
type: boolean
inherited_labels: inherited_labels:
type: array type: array
items: items:

View File

@ -252,8 +252,15 @@ configuration they are grouped under the `kubernetes` key.
teams API. The default is `postgresql-operator`. teams API. The default is `postgresql-operator`.
* **infrastructure_roles_secret_name** * **infrastructure_roles_secret_name**
namespaced name of the secret containing infrastructure roles names and *deprecated*: namespaced name of the secret containing infrastructure roles
passwords. names and passwords.
* **infrastructure_roles_secrets**
array of infrastructure role definitions which reference existing secrets
and specify the keys for extract credentials from them such as user name,
password and role membership. For the configmap this has to be a string
which allows referencing only one infrastructure roles secret.
The default is empty.
* **pod_role_label** * **pod_role_label**
name of the label assigned to the Postgres pods (and services/endpoints) by name of the label assigned to the Postgres pods (and services/endpoints) by

View File

@ -127,6 +127,26 @@ spec:
type: boolean type: boolean
infrastructure_roles_secret_name: infrastructure_roles_secret_name:
type: string type: string
infrastructure_roles_secrets:
type: array
nullable: true
items:
type: object
required:
- secretname
properties:
secretname:
type: string
name:
type: string
password:
type: string
role:
type: string
details:
type: string
template:
type: boolean
inherited_labels: inherited_labels:
type: array type: array
items: items:

View File

@ -911,6 +911,35 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
"infrastructure_roles_secret_name": { "infrastructure_roles_secret_name": {
Type: "string", Type: "string",
}, },
"infrastructure_roles_secrets": {
Type: "array",
Items: &apiextv1beta1.JSONSchemaPropsOrArray{
Schema: &apiextv1beta1.JSONSchemaProps{
Type: "object",
Required: []string{"secretname"},
Properties: map[string]apiextv1beta1.JSONSchemaProps{
"secretname": {
Type: "string",
},
"name": {
Type: "string",
},
"password": {
Type: "string",
},
"role": {
Type: "string",
},
"details": {
Type: "string",
},
"template": {
Type: "boolean",
},
},
},
},
},
"inherited_labels": { "inherited_labels": {
Type: "array", Type: "array",
Items: &apiextv1beta1.JSONSchemaPropsOrArray{ Items: &apiextv1beta1.JSONSchemaPropsOrArray{
@ -980,7 +1009,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
"spilo_privileged": { "spilo_privileged": {
Type: "boolean", Type: "boolean",
}, },
"storage_resize_mode": { "storage_resize_mode": {
Type: "string", Type: "string",
Enum: []apiextv1beta1.JSON{ Enum: []apiextv1beta1.JSON{
{ {