diff --git a/api/v4/common_types.go b/api/v4/common_types.go index e53317075..1748fb238 100644 --- a/api/v4/common_types.go +++ b/api/v4/common_types.go @@ -256,8 +256,8 @@ type CommonSplunkSpec struct { } // StorageClassSpec defines storage class configuration -// +kubebuilder:validation:XValidation:rule="!(size(self.storageClassName) > 0 && self.ephemeralStorage == true)",message="storageClassName and ephemeralStorage are mutually exclusive" -// +kubebuilder:validation:XValidation:rule="!(size(self.storageCapacity) > 0 && self.ephemeralStorage == true)",message="storageCapacity and ephemeralStorage are mutually exclusive" +// +kubebuilder:validation:XValidation:rule="!(has(self.storageClassName) && size(self.storageClassName) > 0 && self.ephemeralStorage == true)",message="storageClassName and ephemeralStorage are mutually exclusive" +// +kubebuilder:validation:XValidation:rule="!(has(self.storageCapacity) && size(self.storageCapacity) > 0 && self.ephemeralStorage == true)",message="storageCapacity and ephemeralStorage are mutually exclusive" type StorageClassSpec struct { // Name of StorageClass to use for persistent volume claims // +optional diff --git a/config/crd/bases/enterprise.splunk.com_clustermanagers.yaml b/config/crd/bases/enterprise.splunk.com_clustermanagers.yaml index a19a639ae..fcffa2f4c 100644 --- a/config/crd/bases/enterprise.splunk.com_clustermanagers.yaml +++ b/config/crd/bases/enterprise.splunk.com_clustermanagers.yaml @@ -1288,11 +1288,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2642,11 +2642,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_clustermasters.yaml b/config/crd/bases/enterprise.splunk.com_clustermasters.yaml index 77b835376..999687c9b 100644 --- a/config/crd/bases/enterprise.splunk.com_clustermasters.yaml +++ b/config/crd/bases/enterprise.splunk.com_clustermasters.yaml @@ -1284,11 +1284,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2638,11 +2638,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_indexerclusters.yaml b/config/crd/bases/enterprise.splunk.com_indexerclusters.yaml index 8ae972d7c..8123ee57b 100644 --- a/config/crd/bases/enterprise.splunk.com_indexerclusters.yaml +++ b/config/crd/bases/enterprise.splunk.com_indexerclusters.yaml @@ -1106,11 +1106,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2321,11 +2321,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ @@ -5320,11 +5320,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -6620,11 +6620,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml b/config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml index 44238ca7a..6dce10582 100644 --- a/config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml +++ b/config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml @@ -1284,11 +1284,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2586,11 +2586,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_licensemanagers.yaml b/config/crd/bases/enterprise.splunk.com_licensemanagers.yaml index b65b6beaf..d41bffa95 100644 --- a/config/crd/bases/enterprise.splunk.com_licensemanagers.yaml +++ b/config/crd/bases/enterprise.splunk.com_licensemanagers.yaml @@ -1278,11 +1278,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2488,11 +2488,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_licensemasters.yaml b/config/crd/bases/enterprise.splunk.com_licensemasters.yaml index c2a96b9e7..5f58680db 100644 --- a/config/crd/bases/enterprise.splunk.com_licensemasters.yaml +++ b/config/crd/bases/enterprise.splunk.com_licensemasters.yaml @@ -1273,11 +1273,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2483,11 +2483,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_monitoringconsoles.yaml b/config/crd/bases/enterprise.splunk.com_monitoringconsoles.yaml index f5142a14f..3c5822bd3 100644 --- a/config/crd/bases/enterprise.splunk.com_monitoringconsoles.yaml +++ b/config/crd/bases/enterprise.splunk.com_monitoringconsoles.yaml @@ -1280,11 +1280,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2490,11 +2490,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ @@ -5900,11 +5900,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -7110,11 +7110,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_searchheadclusters.yaml b/config/crd/bases/enterprise.splunk.com_searchheadclusters.yaml index 4f4674b32..077636918 100644 --- a/config/crd/bases/enterprise.splunk.com_searchheadclusters.yaml +++ b/config/crd/bases/enterprise.splunk.com_searchheadclusters.yaml @@ -1286,11 +1286,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2501,11 +2501,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ @@ -6250,11 +6250,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -7466,11 +7466,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ diff --git a/config/crd/bases/enterprise.splunk.com_standalones.yaml b/config/crd/bases/enterprise.splunk.com_standalones.yaml index 8c8c5035c..710b9afe2 100644 --- a/config/crd/bases/enterprise.splunk.com_standalones.yaml +++ b/config/crd/bases/enterprise.splunk.com_standalones.yaml @@ -1281,11 +1281,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -2639,11 +2639,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/ @@ -6199,11 +6199,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' extraEnv: description: |- ExtraEnv refers to extra environment variables to be passed to the Splunk instance containers @@ -7558,11 +7558,11 @@ spec: type: object x-kubernetes-validations: - message: storageClassName and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageClassName) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageClassName) && size(self.storageClassName) + > 0 && self.ephemeralStorage == true)' - message: storageCapacity and ephemeralStorage are mutually exclusive - rule: '!(size(self.storageCapacity) > 0 && self.ephemeralStorage - == true)' + rule: '!(has(self.storageCapacity) && size(self.storageCapacity) + > 0 && self.ephemeralStorage == true)' volumes: description: List of one or more Kubernetes volumes. These will be mounted in all pod containers as as /mnt/