polishing

This commit is contained in:
Felix Kunde 2020-11-24 15:31:27 +01:00
parent 40a4acd39d
commit 190dcf5192
4 changed files with 16 additions and 15 deletions

View File

@ -436,4 +436,4 @@ spec:
status: status:
type: object type: object
additionalProperties: additionalProperties:
type: string type: string

View File

@ -342,16 +342,16 @@ 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: requests:
type: object type: object
required: required:
- cpu - cpu
- memory - memory
properties: properties:
cpu: cpu:
type: string type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$' pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
memory: memory:
type: string type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$' pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
serviceAnnotations: serviceAnnotations:

View File

@ -121,6 +121,7 @@ class EndToEndTestCase(unittest.TestCase):
"operatorconfiguration.crd.yaml", "operatorconfiguration.crd.yaml",
"postgresteam.crd.yaml", "postgresteam.crd.yaml",
"configmap.yaml", "configmap.yaml",
"postgresql-operator-default-configuration.yaml",
"postgres-operator.yaml", "postgres-operator.yaml",
"api-service.yaml", "api-service.yaml",
"infrastructure-roles.yaml", "infrastructure-roles.yaml",

View File

@ -338,16 +338,16 @@ 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: requests:
type: object type: object
required: required:
- cpu - cpu
- memory - memory
properties: properties:
cpu: cpu:
type: string type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$' pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
memory: memory:
type: string type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$' pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
serviceAnnotations: serviceAnnotations: