Skip to content

Commit 66e309c

Browse files
black-dragon74mergify[bot]
authored andcommitted
manifests: Generate updated manifests for NetworkFence
Signed-off-by: Niraj Yadav <niryadav@redhat.com>
1 parent 419c499 commit 66e309c

2 files changed

Lines changed: 28 additions & 12 deletions

File tree

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

Lines changed: 14 additions & 6 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
@@ -105,18 +112,19 @@ spec:
105112
rule: self == oldSelf
106113
type: object
107114
x-kubernetes-validations:
115+
- message: secrets are immutable
116+
rule: self == oldSelf
108117
- message: secret is immutable
109118
rule: self == oldSelf
110119
required:
111120
- cidrs
112-
- driver
113121
- fenceState
114122
type: object
115123
x-kubernetes-validations:
116-
- message: parameters are immutable
117-
rule: has(self.parameters) == has(oldSelf.parameters)
118-
- message: secret is immutable
119-
rule: has(self.secret) == has(oldSelf.secret)
124+
- message: one of driver or networkFenceClassName must be present
125+
rule: has(self.driver) || has(self.networkFenceClassName)
126+
- message: secret must be present when networkFenceClassName is not specified
127+
rule: has(self.networkFenceClassName) || has(self.secret)
120128
status:
121129
description: NetworkFenceStatus defines the observed state of NetworkFence
122130
properties:

deploy/controller/crds.yaml

Lines changed: 14 additions & 6 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
@@ -764,18 +771,19 @@ spec:
764771
rule: self == oldSelf
765772
type: object
766773
x-kubernetes-validations:
774+
- message: secrets are immutable
775+
rule: self == oldSelf
767776
- message: secret is immutable
768777
rule: self == oldSelf
769778
required:
770779
- cidrs
771-
- driver
772780
- fenceState
773781
type: object
774782
x-kubernetes-validations:
775-
- message: parameters are immutable
776-
rule: has(self.parameters) == has(oldSelf.parameters)
777-
- message: secret is immutable
778-
rule: has(self.secret) == has(oldSelf.secret)
783+
- message: one of driver or networkFenceClassName must be present
784+
rule: has(self.driver) || has(self.networkFenceClassName)
785+
- message: secret must be present when networkFenceClassName is not specified
786+
rule: has(self.networkFenceClassName) || has(self.secret)
779787
status:
780788
description: NetworkFenceStatus defines the observed state of NetworkFence
781789
properties:

0 commit comments

Comments
 (0)