adding validation toggle to validation :D + minor fixes

This commit is contained in:
Felix Kunde 2019-11-27 17:22:47 +01:00
parent 0bda50c7c5
commit 59fa76110c
6 changed files with 28 additions and 10 deletions

View File

@ -58,10 +58,14 @@ spec:
configuration:
type: object
properties:
etcd_host:
type: string
docker_image:
type: string
enable_crd_validation:
type: boolean
enable_shm_volume:
type: boolean
etcd_host:
type: string
max_instances:
type: integer
minimum: -1 # -1 = disabled

View File

@ -59,7 +59,10 @@ configKubernetes:
# label assigned to Kubernetes objects created by the operator
cluster_name_label: cluster-name
# additional annotations to add to every database pod
custom_pod_annotations:
# custom_pod_annotations:
# keya: valuea
# keyb: valueb
# toggles pod anti affinity on the Postgres pods
enable_pod_antiaffinity: false
# toggles PDB to set to MinAvailabe 0 or 1
@ -230,7 +233,7 @@ configTeamsApi:
# teams_api_url: http://fake-teams-api.default.svc.cluster.local
# Scalyr is a log management tool that Zalando uses as a sidecar
scalyr:
configScalyr:
# API key for the Scalyr sidecar
# scalyr_api_key: ""

View File

@ -57,7 +57,8 @@ configKubernetes:
# label assigned to Kubernetes objects created by the operator
cluster_name_label: version
# annotations attached to each database pod
# custom_pod_annotations: keya:valuea
# custom_pod_annotations: keya:valuea,keyb:valueb
# toggles pod anti affinity on the Postgres pods
enable_pod_antiaffinity: "false"
# toggles PDB to set to MinAvailabe 0 or 1

View File

@ -12,7 +12,7 @@ data:
cluster_labels: application:spilo
cluster_name_label: version
# custom_service_annotations: "keyx:valuez,keya:valuea"
# custom_pod_annotations: "keya:valuea"
# custom_pod_annotations: "keya:valuea,keyb:valueb"
db_hosted_zone: db.example.com
debug_logging: "true"
# default_cpu_limit: "3"

View File

@ -34,10 +34,14 @@ spec:
configuration:
type: object
properties:
etcd_host:
type: string
docker_image:
type: string
enable_crd_validation:
type: boolean
enable_shm_volume:
type: boolean
etcd_host:
type: string
max_instances:
type: integer
minimum: -1 # -1 = disabled

View File

@ -607,10 +607,16 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
"configuration": {
Type: "object",
Properties: map[string]apiextv1beta1.JSONSchemaProps{
"etcd_host": {
"docker_image": {
Type: "string",
},
"docker_image": {
"enable_crd_validation": {
Type: "boolean",
},
"enable_shm_volume": {
Type: "boolean",
},
"etcd_host": {
Type: "string",
},
"max_instances": {