clenaing up more merge errors
This commit is contained in:
Felix Kunde
parent
ed80fc7ce6
commit
6984ab1738
|
|
@ -274,6 +274,11 @@ spec:
|
||||||
type: boolean
|
type: boolean
|
||||||
enable_replica_load_balancer:
|
enable_replica_load_balancer:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
external_traffic_policy:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- "Cluster"
|
||||||
|
- "Local"
|
||||||
master_dns_name_format:
|
master_dns_name_format:
|
||||||
type: string
|
type: string
|
||||||
replica_dns_name_format:
|
replica_dns_name_format:
|
||||||
|
|
@ -324,131 +329,6 @@ spec:
|
||||||
type: boolean
|
type: boolean
|
||||||
enable_database_access:
|
enable_database_access:
|
||||||
type: boolean
|
type: boolean
|
||||||
teams_api:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
enable_admin_role_for_users:
|
|
||||||
type: boolean
|
|
||||||
enable_team_superuser:
|
|
||||||
type: boolean
|
|
||||||
enable_teams_api:
|
|
||||||
type: boolean
|
|
||||||
pam_configuration:
|
|
||||||
type: string
|
|
||||||
pam_role_name:
|
|
||||||
type: string
|
|
||||||
postgres_superuser_teams:
|
|
||||||
type: array
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
pod_service_account_name:
|
|
||||||
type: string
|
|
||||||
pod_terminate_grace_period:
|
|
||||||
type: string
|
|
||||||
secret_name_template:
|
|
||||||
type: string
|
|
||||||
spilo_fsgroup:
|
|
||||||
type: integer
|
|
||||||
spilo_privileged:
|
|
||||||
type: boolean
|
|
||||||
toleration:
|
|
||||||
type: object
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
watched_namespace:
|
|
||||||
type: string
|
|
||||||
postgres_pod_resources:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
default_cpu_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
default_cpu_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
default_memory_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
default_memory_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
timeouts:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
pod_label_wait_timeout:
|
|
||||||
type: string
|
|
||||||
pod_deletion_wait_timeout:
|
|
||||||
type: string
|
|
||||||
ready_wait_interval:
|
|
||||||
type: string
|
|
||||||
ready_wait_timeout:
|
|
||||||
type: string
|
|
||||||
resource_check_interval:
|
|
||||||
type: string
|
|
||||||
resource_check_timeout:
|
|
||||||
type: string
|
|
||||||
load_balancer:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
custom_service_annotations:
|
|
||||||
type: object
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
db_hosted_zone:
|
|
||||||
type: string
|
|
||||||
enable_master_load_balancer:
|
|
||||||
type: boolean
|
|
||||||
enable_replica_load_balancer:
|
|
||||||
type: boolean
|
|
||||||
external_traffic_policy:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- "Cluster"
|
|
||||||
- "Local"
|
|
||||||
master_dns_name_format:
|
|
||||||
type: string
|
|
||||||
replica_dns_name_format:
|
|
||||||
type: string
|
|
||||||
aws_or_gcp:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
additional_secret_mount:
|
|
||||||
type: string
|
|
||||||
additional_secret_mount_path:
|
|
||||||
type: string
|
|
||||||
aws_region:
|
|
||||||
type: string
|
|
||||||
kube_iam_role:
|
|
||||||
type: string
|
|
||||||
log_s3_bucket:
|
|
||||||
type: string
|
|
||||||
wal_s3_bucket:
|
|
||||||
type: string
|
|
||||||
logical_backup:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
logical_backup_schedule:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
|
|
||||||
logical_backup_docker_image:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_bucket:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_endpoint:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_sse:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_access_key_id:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_secret_access_key:
|
|
||||||
type: string
|
|
||||||
debug:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
debug_logging:
|
|
||||||
type: boolean
|
|
||||||
enable_database_access:
|
|
||||||
type: boolean
|
|
||||||
teams_api:
|
teams_api:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
|
@ -491,38 +371,6 @@ spec:
|
||||||
type: integer
|
type: integer
|
||||||
ring_log_lines:
|
ring_log_lines:
|
||||||
type: integer
|
type: integer
|
||||||
scalyr:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
scalyr_api_key:
|
|
||||||
type: string
|
|
||||||
scalyr_cpu_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
scalyr_cpu_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
scalyr_image:
|
|
||||||
type: string
|
|
||||||
scalyr_memory_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
scalyr_memory_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
scalyr_server_url:
|
|
||||||
type: string
|
|
||||||
teams_api_url:
|
|
||||||
type: string
|
|
||||||
logging_rest_api:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
api_port:
|
|
||||||
type: integer
|
|
||||||
cluster_history_entries:
|
|
||||||
type: integer
|
|
||||||
ring_log_lines:
|
|
||||||
type: integer
|
|
||||||
scalyr: # deprecated
|
scalyr: # deprecated
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
|
|
||||||
|
|
@ -233,18 +233,28 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
type: string
|
type: string
|
||||||
ttl:
|
|
||||||
type: integer
|
|
||||||
loop_wait:
|
loop_wait:
|
||||||
type: integer
|
type: integer
|
||||||
retry_timeout:
|
|
||||||
type: integer
|
|
||||||
maximum_lag_on_failover:
|
maximum_lag_on_failover:
|
||||||
type: integer
|
type: integer
|
||||||
|
pg_hba:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
retry_timeout:
|
||||||
|
type: integer
|
||||||
|
slots:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
synchronous_mode:
|
synchronous_mode:
|
||||||
type: boolean
|
type: boolean
|
||||||
synchronous_mode_strict:
|
synchronous_mode_strict:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
ttl:
|
||||||
|
type: integer
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
|
|
@ -304,11 +314,10 @@ spec:
|
||||||
limits:
|
limits:
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- key
|
- cpu
|
||||||
- operator
|
- memory
|
||||||
- effect
|
|
||||||
properties:
|
properties:
|
||||||
key:
|
cpu:
|
||||||
type: string
|
type: string
|
||||||
# Decimal natural followed by m, or decimal natural followed by
|
# Decimal natural followed by m, or decimal natural followed by
|
||||||
# dot followed by up to three decimal digits.
|
# dot followed by up to three decimal digits.
|
||||||
|
|
@ -323,26 +332,6 @@ spec:
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
||||||
# Note: the value specified here must not be zero or be lower
|
# Note: the value specified here must not be zero or be lower
|
||||||
# than the corresponding request.
|
# than the corresponding request.
|
||||||
memory:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- Equal
|
|
||||||
- Exists
|
|
||||||
value:
|
|
||||||
type: string
|
|
||||||
# Decimal natural followed by m, or decimal natural followed by
|
|
||||||
# dot followed by up to three decimal digits.
|
|
||||||
#
|
|
||||||
# This is because the Kubernetes CPU resource has millis as the
|
|
||||||
# maximum precision. The actual values are checked in code
|
|
||||||
# because the regular expression would be huge and horrible and
|
|
||||||
# not very helpful in validation error messages; this one checks
|
|
||||||
# only the format of the given number.
|
|
||||||
#
|
|
||||||
# https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
# Note: the value specified here must not be zero or be higher
|
|
||||||
# than the corresponding limit.
|
|
||||||
memory:
|
memory:
|
||||||
type: string
|
type: string
|
||||||
# You can express memory as a plain integer or as a fixed-point
|
# You can express memory as a plain integer or as a fixed-point
|
||||||
|
|
@ -353,6 +342,18 @@ spec:
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
||||||
# Note: the value specified here must not be zero or be higher
|
# Note: the value specified here must not be zero or be higher
|
||||||
# than the corresponding limit.
|
# than the corresponding limit.
|
||||||
|
requests:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- cpu
|
||||||
|
- memory
|
||||||
|
properties:
|
||||||
|
cpu:
|
||||||
|
type: string
|
||||||
|
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
||||||
|
memory:
|
||||||
|
type: string
|
||||||
|
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
||||||
serviceAnnotations:
|
serviceAnnotations:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
|
|
@ -398,15 +399,20 @@ spec:
|
||||||
items:
|
items:
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- size
|
- key
|
||||||
|
- operator
|
||||||
|
- effect
|
||||||
properties:
|
properties:
|
||||||
size:
|
key:
|
||||||
type: string
|
type: string
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
operator:
|
||||||
# Note: the value specified here must not be zero.
|
|
||||||
storageClass:
|
|
||||||
type: string
|
type: string
|
||||||
subPath:
|
enum:
|
||||||
|
- Equal
|
||||||
|
- Exists
|
||||||
|
value:
|
||||||
|
type: string
|
||||||
|
effect:
|
||||||
type: string
|
type: string
|
||||||
enum:
|
enum:
|
||||||
- NoExecute
|
- NoExecute
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
image:
|
image:
|
||||||
registry: registry.opensource.zalan.do
|
registry: registry.opensource.zalan.do
|
||||||
repository: acid/postgres-operator
|
repository: acid/postgres-operator
|
||||||
tag: v1.5.0
|
tag: v1.5.0-79-ged80fc7c-dirty
|
||||||
pullPolicy: "IfNotPresent"
|
pullPolicy: "IfNotPresent"
|
||||||
|
|
||||||
# Optionally specify an array of imagePullSecrets.
|
# Optionally specify an array of imagePullSecrets.
|
||||||
|
|
|
||||||
|
|
@ -145,19 +145,19 @@ spec:
|
||||||
- name: date
|
- name: date
|
||||||
image: busybox
|
image: busybox
|
||||||
command: [ "/bin/date" ]
|
command: [ "/bin/date" ]
|
||||||
# sidecars:
|
sidecars:
|
||||||
# - name: "telegraf-sidecar"
|
- name: "telegraf-sidecar"
|
||||||
# image: "telegraf:latest"
|
image: "telegraf:latest"
|
||||||
# resources:
|
resources:
|
||||||
# limits:
|
limits:
|
||||||
# cpu: 500m
|
cpu: 500m
|
||||||
# memory: 500Mi
|
memory: 500Mi
|
||||||
# requests:
|
requests:
|
||||||
# cpu: 100m
|
cpu: 100m
|
||||||
# memory: 100Mi
|
memory: 100Mi
|
||||||
# env:
|
env:
|
||||||
# - name: "USEFUL_VAR"
|
- name: "USEFUL_VAR"
|
||||||
# value: "perhaps-true"
|
value: "perhaps-true"
|
||||||
|
|
||||||
# Custom TLS certificate. Disabled unless tls.secretName has a value.
|
# Custom TLS certificate. Disabled unless tls.secretName has a value.
|
||||||
tls:
|
tls:
|
||||||
|
|
|
||||||
|
|
@ -270,6 +270,11 @@ spec:
|
||||||
type: boolean
|
type: boolean
|
||||||
enable_replica_load_balancer:
|
enable_replica_load_balancer:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
external_traffic_policy:
|
||||||
|
type: string
|
||||||
|
enum:
|
||||||
|
- "Cluster"
|
||||||
|
- "Local"
|
||||||
master_dns_name_format:
|
master_dns_name_format:
|
||||||
type: string
|
type: string
|
||||||
replica_dns_name_format:
|
replica_dns_name_format:
|
||||||
|
|
@ -320,131 +325,6 @@ spec:
|
||||||
type: boolean
|
type: boolean
|
||||||
enable_database_access:
|
enable_database_access:
|
||||||
type: boolean
|
type: boolean
|
||||||
teams_api:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
enable_admin_role_for_users:
|
|
||||||
type: boolean
|
|
||||||
enable_team_superuser:
|
|
||||||
type: boolean
|
|
||||||
enable_teams_api:
|
|
||||||
type: boolean
|
|
||||||
pam_configuration:
|
|
||||||
type: string
|
|
||||||
pam_role_name:
|
|
||||||
type: string
|
|
||||||
postgres_superuser_teams:
|
|
||||||
type: array
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
pod_service_account_name:
|
|
||||||
type: string
|
|
||||||
pod_terminate_grace_period:
|
|
||||||
type: string
|
|
||||||
secret_name_template:
|
|
||||||
type: string
|
|
||||||
spilo_fsgroup:
|
|
||||||
type: integer
|
|
||||||
spilo_privileged:
|
|
||||||
type: boolean
|
|
||||||
toleration:
|
|
||||||
type: object
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
watched_namespace:
|
|
||||||
type: string
|
|
||||||
postgres_pod_resources:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
default_cpu_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
default_cpu_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
default_memory_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
default_memory_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
timeouts:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
pod_label_wait_timeout:
|
|
||||||
type: string
|
|
||||||
pod_deletion_wait_timeout:
|
|
||||||
type: string
|
|
||||||
ready_wait_interval:
|
|
||||||
type: string
|
|
||||||
ready_wait_timeout:
|
|
||||||
type: string
|
|
||||||
resource_check_interval:
|
|
||||||
type: string
|
|
||||||
resource_check_timeout:
|
|
||||||
type: string
|
|
||||||
load_balancer:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
custom_service_annotations:
|
|
||||||
type: object
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
db_hosted_zone:
|
|
||||||
type: string
|
|
||||||
enable_master_load_balancer:
|
|
||||||
type: boolean
|
|
||||||
enable_replica_load_balancer:
|
|
||||||
type: boolean
|
|
||||||
external_traffic_policy:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- "Cluster"
|
|
||||||
- "Local"
|
|
||||||
master_dns_name_format:
|
|
||||||
type: string
|
|
||||||
replica_dns_name_format:
|
|
||||||
type: string
|
|
||||||
aws_or_gcp:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
additional_secret_mount:
|
|
||||||
type: string
|
|
||||||
additional_secret_mount_path:
|
|
||||||
type: string
|
|
||||||
aws_region:
|
|
||||||
type: string
|
|
||||||
kube_iam_role:
|
|
||||||
type: string
|
|
||||||
log_s3_bucket:
|
|
||||||
type: string
|
|
||||||
wal_s3_bucket:
|
|
||||||
type: string
|
|
||||||
logical_backup:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
logical_backup_schedule:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
|
|
||||||
logical_backup_docker_image:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_bucket:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_endpoint:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_sse:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_access_key_id:
|
|
||||||
type: string
|
|
||||||
logical_backup_s3_secret_access_key:
|
|
||||||
type: string
|
|
||||||
debug:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
debug_logging:
|
|
||||||
type: boolean
|
|
||||||
enable_database_access:
|
|
||||||
type: boolean
|
|
||||||
teams_api:
|
teams_api:
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
|
@ -487,38 +367,6 @@ spec:
|
||||||
type: integer
|
type: integer
|
||||||
ring_log_lines:
|
ring_log_lines:
|
||||||
type: integer
|
type: integer
|
||||||
scalyr:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
scalyr_api_key:
|
|
||||||
type: string
|
|
||||||
scalyr_cpu_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
scalyr_cpu_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
scalyr_image:
|
|
||||||
type: string
|
|
||||||
scalyr_memory_limit:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
scalyr_memory_request:
|
|
||||||
type: string
|
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
|
||||||
scalyr_server_url:
|
|
||||||
type: string
|
|
||||||
teams_api_url:
|
|
||||||
type: string
|
|
||||||
logging_rest_api:
|
|
||||||
type: object
|
|
||||||
properties:
|
|
||||||
api_port:
|
|
||||||
type: integer
|
|
||||||
cluster_history_entries:
|
|
||||||
type: integer
|
|
||||||
ring_log_lines:
|
|
||||||
type: integer
|
|
||||||
scalyr: # deprecated
|
scalyr: # deprecated
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
|
|
||||||
|
|
@ -229,18 +229,28 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
type: string
|
type: string
|
||||||
ttl:
|
|
||||||
type: integer
|
|
||||||
loop_wait:
|
loop_wait:
|
||||||
type: integer
|
type: integer
|
||||||
retry_timeout:
|
|
||||||
type: integer
|
|
||||||
maximum_lag_on_failover:
|
maximum_lag_on_failover:
|
||||||
type: integer
|
type: integer
|
||||||
|
pg_hba:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
retry_timeout:
|
||||||
|
type: integer
|
||||||
|
slots:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
synchronous_mode:
|
synchronous_mode:
|
||||||
type: boolean
|
type: boolean
|
||||||
synchronous_mode_strict:
|
synchronous_mode_strict:
|
||||||
type: boolean
|
type: boolean
|
||||||
|
ttl:
|
||||||
|
type: integer
|
||||||
podAnnotations:
|
podAnnotations:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
|
|
@ -300,11 +310,10 @@ spec:
|
||||||
limits:
|
limits:
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- key
|
- cpu
|
||||||
- operator
|
- memory
|
||||||
- effect
|
|
||||||
properties:
|
properties:
|
||||||
key:
|
cpu:
|
||||||
type: string
|
type: string
|
||||||
# Decimal natural followed by m, or decimal natural followed by
|
# Decimal natural followed by m, or decimal natural followed by
|
||||||
# dot followed by up to three decimal digits.
|
# dot followed by up to three decimal digits.
|
||||||
|
|
@ -319,26 +328,6 @@ spec:
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
||||||
# Note: the value specified here must not be zero or be lower
|
# Note: the value specified here must not be zero or be lower
|
||||||
# than the corresponding request.
|
# than the corresponding request.
|
||||||
memory:
|
|
||||||
type: string
|
|
||||||
enum:
|
|
||||||
- Equal
|
|
||||||
- Exists
|
|
||||||
value:
|
|
||||||
type: string
|
|
||||||
# Decimal natural followed by m, or decimal natural followed by
|
|
||||||
# dot followed by up to three decimal digits.
|
|
||||||
#
|
|
||||||
# This is because the Kubernetes CPU resource has millis as the
|
|
||||||
# maximum precision. The actual values are checked in code
|
|
||||||
# because the regular expression would be huge and horrible and
|
|
||||||
# not very helpful in validation error messages; this one checks
|
|
||||||
# only the format of the given number.
|
|
||||||
#
|
|
||||||
# https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu
|
|
||||||
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
|
||||||
# Note: the value specified here must not be zero or be higher
|
|
||||||
# than the corresponding limit.
|
|
||||||
memory:
|
memory:
|
||||||
type: string
|
type: string
|
||||||
# You can express memory as a plain integer or as a fixed-point
|
# You can express memory as a plain integer or as a fixed-point
|
||||||
|
|
@ -349,6 +338,18 @@ spec:
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
||||||
# Note: the value specified here must not be zero or be higher
|
# Note: the value specified here must not be zero or be higher
|
||||||
# than the corresponding limit.
|
# than the corresponding limit.
|
||||||
|
requests:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- cpu
|
||||||
|
- memory
|
||||||
|
properties:
|
||||||
|
cpu:
|
||||||
|
type: string
|
||||||
|
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
|
||||||
|
memory:
|
||||||
|
type: string
|
||||||
|
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
||||||
serviceAnnotations:
|
serviceAnnotations:
|
||||||
type: object
|
type: object
|
||||||
additionalProperties:
|
additionalProperties:
|
||||||
|
|
@ -394,15 +395,20 @@ spec:
|
||||||
items:
|
items:
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
- size
|
- key
|
||||||
|
- operator
|
||||||
|
- effect
|
||||||
properties:
|
properties:
|
||||||
size:
|
key:
|
||||||
type: string
|
type: string
|
||||||
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
|
operator:
|
||||||
# Note: the value specified here must not be zero.
|
|
||||||
storageClass:
|
|
||||||
type: string
|
type: string
|
||||||
subPath:
|
enum:
|
||||||
|
- Equal
|
||||||
|
- Exists
|
||||||
|
value:
|
||||||
|
type: string
|
||||||
|
effect:
|
||||||
type: string
|
type: string
|
||||||
enum:
|
enum:
|
||||||
- NoExecute
|
- NoExecute
|
||||||
|
|
|
||||||
|
|
@ -357,6 +357,12 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"loop_wait": {
|
||||||
|
Type: "integer",
|
||||||
|
},
|
||||||
|
"maximum_lag_on_failover": {
|
||||||
|
Type: "integer",
|
||||||
|
},
|
||||||
"pg_hba": {
|
"pg_hba": {
|
||||||
Type: "array",
|
Type: "array",
|
||||||
Items: &apiextv1.JSONSchemaPropsOrArray{
|
Items: &apiextv1.JSONSchemaPropsOrArray{
|
||||||
|
|
@ -365,6 +371,9 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"retry_timeout": {
|
||||||
|
Type: "integer",
|
||||||
|
},
|
||||||
"slots": {
|
"slots": {
|
||||||
Type: "object",
|
Type: "object",
|
||||||
AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
|
AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
|
||||||
|
|
@ -378,24 +387,15 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"ttl": {
|
|
||||||
Type: "integer",
|
|
||||||
},
|
|
||||||
"loop_wait": {
|
|
||||||
Type: "integer",
|
|
||||||
},
|
|
||||||
"retry_timeout": {
|
|
||||||
Type: "integer",
|
|
||||||
},
|
|
||||||
"maximum_lag_on_failover": {
|
|
||||||
Type: "integer",
|
|
||||||
},
|
|
||||||
"synchronous_mode": {
|
"synchronous_mode": {
|
||||||
Type: "boolean",
|
Type: "boolean",
|
||||||
},
|
},
|
||||||
"synchronous_mode_strict": {
|
"synchronous_mode_strict": {
|
||||||
Type: "boolean",
|
Type: "boolean",
|
||||||
},
|
},
|
||||||
|
"ttl": {
|
||||||
|
Type: "integer",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"podAnnotations": {
|
"podAnnotations": {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue