Skip to content

operator/v1: replace anyOf with CEL XValidation for maxConnections #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asadawar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

operator/v1: replace anyOf with CEL XValidation for maxConnections #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ...1/manual-override-crd-manifests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ spec:
- properties:
address:
format: ipv6
tuningOptions:
anyOf:
- properties:
maxConnections:
enum:
- -1
- 0
- properties:
maxConnections:
format: int32
maximum: 2000000
minimum: 2000
subresources:
scale:
labelSelectorPath: .status.selector
Expand Down
225 changes: 225 additions & 0 deletions operator/v1/tests/ingresscontrollers.operator.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,138 @@ tests:
tuningOptions:
httpKeepAliveTimeout: 0.001ms
expectedError: "IngressController.operator.openshift.io \"default\" is invalid: spec.tuningOptions.httpKeepAliveTimeout: Invalid value: \"string\": httpKeepAliveTimeout must be greater than or equal to 1 millisecond"
- name: Should be able to create an IngressController with maxConnections set to -1
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: -1
expected: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
httpEmptyRequestsPolicy: Respond
idleConnectionTerminationPolicy: Immediate
closedClientConnectionPolicy: Continue
tuningOptions:
maxConnections: -1
- name: Should be able to create an IngressController with maxConnections at minimum range
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 2000
expected: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
httpEmptyRequestsPolicy: Respond
idleConnectionTerminationPolicy: Immediate
closedClientConnectionPolicy: Continue
tuningOptions:
maxConnections: 2000
- name: Should be able to create an IngressController with maxConnections at maximum range
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 2000000
expected: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
httpEmptyRequestsPolicy: Respond
idleConnectionTerminationPolicy: Immediate
closedClientConnectionPolicy: Continue
tuningOptions:
maxConnections: 2000000
- name: Should be able to create an IngressController with maxConnections in mid range
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 50000
expected: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
httpEmptyRequestsPolicy: Respond
idleConnectionTerminationPolicy: Immediate
closedClientConnectionPolicy: Continue
tuningOptions:
maxConnections: 50000
- name: Should not be able to create an IngressController with maxConnections below minimum range
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 500
expectedError: "maxConnections must be 0, -1, or between 2000 and 2000000"
- name: Should not be able to create an IngressController with maxConnections above maximum range
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 3000000
expectedError: "maxConnections must be 0, -1, or between 2000 and 2000000"
- name: Should not be able to create an IngressController with maxConnections of 1
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 1
expectedError: "maxConnections must be 0, -1, or between 2000 and 2000000"
- name: Should not be able to create an IngressController with maxConnections of 1999
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: default
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 1999
expectedError: "maxConnections must be 0, -1, or between 2000 and 2000000"
- name: Should be able to create an IngressController with valid domain
initial: |
apiVersion: operator.openshift.io/v1
Expand Down Expand Up @@ -830,3 +962,96 @@ tests:
closedClientConnectionPolicy: Continue
domain: "*.foo.com"
replicas: 3
- name: Should be able to update invalid maxConnections to a valid value
initialCRDPatches:
- op: remove
path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/tuningOptions/properties/maxConnections/x-kubernetes-validations
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 500
updated: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 50000
expected: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
httpEmptyRequestsPolicy: Respond
idleConnectionTerminationPolicy: Immediate
closedClientConnectionPolicy: Continue
tuningOptions:
maxConnections: 50000
- name: Should not be able to update invalid maxConnections to another invalid value
initialCRDPatches:
- op: remove
path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/tuningOptions/properties/maxConnections/x-kubernetes-validations
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 500
updated: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 999
expectedError: "maxConnections must be 0, -1, or between 2000 and 2000000"
- name: Should be able to update other fields while retaining invalid maxConnections due to ratcheting
initialCRDPatches:
- op: remove
path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/tuningOptions/properties/maxConnections/x-kubernetes-validations
initial: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 500
updated: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
tuningOptions:
maxConnections: 500
replicas: 3
expected: |
apiVersion: operator.openshift.io/v1
kind: IngressController
metadata:
name: ic-maxconn-test
namespace: openshift-ingress-operator
spec:
httpEmptyRequestsPolicy: Respond
idleConnectionTerminationPolicy: Immediate
closedClientConnectionPolicy: Continue
tuningOptions:
maxConnections: 500
replicas: 3
1 change: 1 addition & 0 deletions operator/v1/types_ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2034,6 +2034,7 @@ type IngressControllerTuningOptions struct {
// processes in router containers with the following metric:
// 'container_memory_working_set_bytes{container="router",namespace="openshift-ingress"}/container_processes{container="router",namespace="openshift-ingress"}'.
//
// +kubebuilder:validation:XValidation:rule="self == 0 || self == -1 || (self >= 2000 && self <= 2000000)",message="maxConnections must be 0, -1, or between 2000 and 2000000"
// +optional
MaxConnections int32 `json:"maxConnections,omitempty"`

Expand Down
14 changes: 3 additions & 11 deletions ...zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,17 +2118,6 @@ spec:
type: string
type: object
tuningOptions:
anyOf:
- properties:
maxConnections:
enum:
- -1
- 0
- properties:
maxConnections:
format: int32
maximum: 2000000
minimum: 2000
description: |-
tuningOptions defines parameters for adjusting the performance of
ingress controller pods. All fields are optional and will use their
Expand Down Expand Up @@ -2341,6 +2330,9 @@ spec:
'container_memory_working_set_bytes{container="router",namespace="openshift-ingress"}/container_processes{container="router",namespace="openshift-ingress"}'.
format: int32
type: integer
x-kubernetes-validations:
- message: maxConnections must be 0, -1, or between 2000 and 2000000
rule: self == 0 || self == -1 || (self >= 2000 && self <= 2000000)
reloadInterval:
description: |-
reloadInterval defines the minimum interval at which the router is allowed to reload
Expand Down
14 changes: 3 additions & 11 deletions ...ator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,17 +2118,6 @@ spec:
type: string
type: object
tuningOptions:
anyOf:
- properties:
maxConnections:
enum:
- -1
- 0
- properties:
maxConnections:
format: int32
maximum: 2000000
minimum: 2000
description: |-
tuningOptions defines parameters for adjusting the performance of
ingress controller pods. All fields are optional and will use their
Expand Down Expand Up @@ -2310,6 +2299,9 @@ spec:
'container_memory_working_set_bytes{container="router",namespace="openshift-ingress"}/container_processes{container="router",namespace="openshift-ingress"}'.
format: int32
type: integer
x-kubernetes-validations:
- message: maxConnections must be 0, -1, or between 2000 and 2000000
rule: self == 0 || self == -1 || (self >= 2000 && self <= 2000000)
reloadInterval:
description: |-
reloadInterval defines the minimum interval at which the router is allowed to reload
Expand Down
14 changes: 3 additions & 11 deletions ...enerated.crd-manifests/0000_50_ingress_00_ingresscontrollers-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,17 +2118,6 @@ spec:
type: string
type: object
tuningOptions:
anyOf:
- properties:
maxConnections:
enum:
- -1
- 0
- properties:
maxConnections:
format: int32
maximum: 2000000
minimum: 2000
description: |-
tuningOptions defines parameters for adjusting the performance of
ingress controller pods. All fields are optional and will use their
Expand Down Expand Up @@ -2341,6 +2330,9 @@ spec:
'container_memory_working_set_bytes{container="router",namespace="openshift-ingress"}/container_processes{container="router",namespace="openshift-ingress"}'.
format: int32
type: integer
x-kubernetes-validations:
- message: maxConnections must be 0, -1, or between 2000 and 2000000
rule: self == 0 || self == -1 || (self >= 2000 && self <= 2000000)
reloadInterval:
description: |-
reloadInterval defines the minimum interval at which the router is allowed to reload
Expand Down
14 changes: 3 additions & 11 deletions operator/v1/zz_generated.crd-manifests/0000_50_ingress_00_ingresscontrollers-OKD.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,17 +2118,6 @@ spec:
type: string
type: object
tuningOptions:
anyOf:
- properties:
maxConnections:
enum:
- -1
- 0
- properties:
maxConnections:
format: int32
maximum: 2000000
minimum: 2000
description: |-
tuningOptions defines parameters for adjusting the performance of
ingress controller pods. All fields are optional and will use their
Expand Down Expand Up @@ -2310,6 +2299,9 @@ spec:
'container_memory_working_set_bytes{container="router",namespace="openshift-ingress"}/container_processes{container="router",namespace="openshift-ingress"}'.
format: int32
type: integer
x-kubernetes-validations:
- message: maxConnections must be 0, -1, or between 2000 and 2000000
rule: self == 0 || self == -1 || (self >= 2000 && self <= 2000000)
reloadInterval:
description: |-
reloadInterval defines the minimum interval at which the router is allowed to reload
Expand Down
Loading