Skip to content

OCPBUGS-32275: Add ingress.spec.domain immutability validation #2695

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
grzpiotrowski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-32275: Add ingress.spec.domain immutability validation #2695

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
57 changes: 57 additions & 0 deletions config/v1/tests/ingresses.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,60 @@ tests:
apiVersion: config.openshift.io/v1
kind: Ingress
spec: {}
- name: Should be able to create an Ingress with domain set
initial: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
expected: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
onUpdate:
- name: Should be able to set domain initially when empty
initial: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec: {}
updated: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
expected: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
- name: Should not be able to change domain once set
initial: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
updated: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: test.example.com
expectedError: "domain is immutable once set"
- name: Should be able to update other fields without changing domain
initial: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
updated: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
appsDomain: custom.example.com
expected: |
apiVersion: config.openshift.io/v1
kind: Ingress
spec:
domain: apps.example.com
appsDomain: custom.example.com
2 changes: 2 additions & 0 deletions config/v1/types_ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ type IngressSpec struct {
// default ingresscontroller domain will follow this pattern: "*.<domain>".
//
// Once set, changing domain is not currently supported.
// +kubebuilder:validation:XValidation:rule="oldSelf == '' || self == oldSelf",message="domain is immutable once set"
// +optional
Domain string `json:"domain"`

// appsDomain is an optional domain to use instead of the one specified
Expand Down
3 changes: 3 additions & 0 deletions config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_ingresses.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ spec:

Once set, changing domain is not currently supported.
type: string
x-kubernetes-validations:
- message: domain is immutable once set
rule: oldSelf == '' || self == oldSelf
loadBalancer:
description: |-
loadBalancer contains the load balancer details in general which are not only specific to the underlying infrastructure
Expand Down
3 changes: 3 additions & 0 deletions ...v1/zz_generated.featuregated-crd-manifests/ingresses.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ spec:

Once set, changing domain is not currently supported.
type: string
x-kubernetes-validations:
- message: domain is immutable once set
rule: oldSelf == '' || self == oldSelf
loadBalancer:
description: |-
loadBalancer contains the load balancer details in general which are not only specific to the underlying infrastructure
Expand Down
1 change: 0 additions & 1 deletion openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions payload-manifests/crds/0000_10_config-operator_01_ingresses.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ spec:

Once set, changing domain is not currently supported.
type: string
x-kubernetes-validations:
- message: domain is immutable once set
rule: oldSelf == '' || self == oldSelf
loadBalancer:
description: |-
loadBalancer contains the load balancer details in general which are not only specific to the underlying infrastructure
Expand Down