Skip to content

Commit 859f364

Browse files
manifests: Generate updated manifests for NetworkFence
Signed-off-by: Niraj Yadav <niryadav@redhat.com>
1 parent 7c4b250 commit 859f364

2 files changed

Lines changed: 20 additions & 4 deletions

File tree

config/crd/bases/csiaddons.openshift.io_networkfences.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ spec:
6262
type: string
6363
type: array
6464
driver:
65-
description: Driver contains the name of CSI driver.
65+
description: Driver contains the name of CSI driver, required if NetworkFenceClassName
66+
is absent
6667
type: string
6768
x-kubernetes-validations:
6869
- message: driver is immutable
@@ -76,6 +77,12 @@ spec:
7677
- Fenced
7778
- Unfenced
7879
type: string
80+
networkFenceClassName:
81+
description: NetworkFenceClassName contains the name of the NetworkFenceClass
82+
type: string
83+
x-kubernetes-validations:
84+
- message: networkFenceClassName is immutable
85+
rule: self == oldSelf
7986
parameters:
8087
additionalProperties:
8188
type: string
@@ -109,14 +116,15 @@ spec:
109116
rule: self == oldSelf
110117
required:
111118
- cidrs
112-
- driver
113119
- fenceState
114120
type: object
115121
x-kubernetes-validations:
116122
- message: parameters are immutable
117123
rule: has(self.parameters) == has(oldSelf.parameters)
118124
- message: secret is immutable
119125
rule: has(self.secret) == has(oldSelf.secret)
126+
- message: one of driver or networkFenceClassName must be present
127+
rule: has(self.driver) || has(self.networkFenceClassName)
120128
status:
121129
description: NetworkFenceStatus defines the observed state of NetworkFence
122130
properties:

deploy/controller/crds.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,8 @@ spec:
721721
type: string
722722
type: array
723723
driver:
724-
description: Driver contains the name of CSI driver.
724+
description: Driver contains the name of CSI driver, required if NetworkFenceClassName
725+
is absent
725726
type: string
726727
x-kubernetes-validations:
727728
- message: driver is immutable
@@ -735,6 +736,12 @@ spec:
735736
- Fenced
736737
- Unfenced
737738
type: string
739+
networkFenceClassName:
740+
description: NetworkFenceClassName contains the name of the NetworkFenceClass
741+
type: string
742+
x-kubernetes-validations:
743+
- message: networkFenceClassName is immutable
744+
rule: self == oldSelf
738745
parameters:
739746
additionalProperties:
740747
type: string
@@ -768,14 +775,15 @@ spec:
768775
rule: self == oldSelf
769776
required:
770777
- cidrs
771-
- driver
772778
- fenceState
773779
type: object
774780
x-kubernetes-validations:
775781
- message: parameters are immutable
776782
rule: has(self.parameters) == has(oldSelf.parameters)
777783
- message: secret is immutable
778784
rule: has(self.secret) == has(oldSelf.secret)
785+
- message: one of driver or networkFenceClassName must be present
786+
rule: has(self.driver) || has(self.networkFenceClassName)
779787
status:
780788
description: NetworkFenceStatus defines the observed state of NetworkFence
781789
properties:

0 commit comments

Comments
 (0)