Skip to content

Commit 5052e1b

Browse files
committed
fix unit tests
Signed-off-by: Britania Rodriguez Reyes <[email protected]>
1 parent 9fe5847 commit 5052e1b

6 files changed

+56
-193
lines changed

apis/placement/v1alpha1/override_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ type JSONPatchOverride struct {
201201
// Note: override will fail if the resource path does not exist.
202202
// +required
203203
// +kubebuilder:validation:XValidation:rule="!(self == '/kind' || self == '/apiVersion')",message="Path cannot target typeMeta fields (kind, apiVersion)"
204-
// +kubebuilder:validation:XValidation:rule="!(self.startsWith('/metadata') && (!(self.startsWith('/metadata/annotations') || self.startsWith('/metadata/labels'))) || self == '/metadata')",message="Path can only target annotations and labels under metadata"
204+
// +kubebuilder:validation:XValidation:rule="!(self.startsWith('/metadata') && !(self.startsWith('/metadata/annotations') && self.startsWith('/metadata/labels')))",message="Path can only target annotations and labels under metadata"
205205
// +kubebuilder:validation:XValidation:rule="!self.startsWith('/status')",message="Path cannot target status fields"
206206
Path string `json:"path"`
207207
// Value defines the content to be applied on the target location.

config/crd/bases/placement.kubernetes-fleet.io_clusterresourceoverrides.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,8 @@ spec:
333333
rule: '!(self == ''/kind'' || self == ''/apiVersion'')'
334334
- message: Path can only target annotations and labels
335335
under metadata
336-
rule: '!(self.startsWith(''/metadata'') && (!(self.startsWith(''/metadata/annotations'')
337-
|| self.startsWith(''/metadata/labels''))) ||
338-
self == ''/metadata'')'
336+
rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
337+
&& self.startsWith(''/metadata/labels'')))'
339338
- message: Path cannot target status fields
340339
rule: '!self.startsWith(''/status'')'
341340
value:

config/crd/bases/placement.kubernetes-fleet.io_clusterresourceoverridesnapshots.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,8 @@ spec:
347347
rule: '!(self == ''/kind'' || self == ''/apiVersion'')'
348348
- message: Path can only target annotations and
349349
labels under metadata
350-
rule: '!(self.startsWith(''/metadata'') && (!(self.startsWith(''/metadata/annotations'')
351-
|| self.startsWith(''/metadata/labels'')))
352-
|| self == ''/metadata'')'
350+
rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
351+
&& self.startsWith(''/metadata/labels'')))'
353352
- message: Path cannot target status fields
354353
rule: '!self.startsWith(''/status'')'
355354
value:

config/crd/bases/placement.kubernetes-fleet.io_resourceoverrides.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,8 @@ spec:
249249
rule: '!(self == ''/kind'' || self == ''/apiVersion'')'
250250
- message: Path can only target annotations and labels
251251
under metadata
252-
rule: '!(self.startsWith(''/metadata'') && (!(self.startsWith(''/metadata/annotations'')
253-
|| self.startsWith(''/metadata/labels''))) ||
254-
self == ''/metadata'')'
252+
rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
253+
&& self.startsWith(''/metadata/labels'')))'
255254
- message: Path cannot target status fields
256255
rule: '!self.startsWith(''/status'')'
257256
value:

config/crd/bases/placement.kubernetes-fleet.io_resourceoverridesnapshots.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,8 @@ spec:
263263
rule: '!(self == ''/kind'' || self == ''/apiVersion'')'
264264
- message: Path can only target annotations and
265265
labels under metadata
266-
rule: '!(self.startsWith(''/metadata'') && (!(self.startsWith(''/metadata/annotations'')
267-
|| self.startsWith(''/metadata/labels'')))
268-
|| self == ''/metadata'')'
266+
rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
267+
&& self.startsWith(''/metadata/labels'')))'
269268
- message: Path cannot target status fields
270269
rule: '!self.startsWith(''/status'')'
271270
value:

0 commit comments

Comments
 (0)