single deployment refactor

Signed-off-by: Tommy Hughes <[email protected]>
feast-dev · Dec 20, 2024 · e598166 · e598166
1 parent 62787b2
commit e598166
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/infra/feast-operator/api/v1alpha1/featurestore_types.go b/infra/feast-operator/api/v1alpha1/featurestore_types.go
@@ -146,7 +146,7 @@ type OnlineStorePersistence struct {
 // OnlineStoreFilePersistence configures the file-based persistence for the offline store service
 // +kubebuilder:validation:XValidation:rule="(!has(self.pvc) && has(self.path)) ? self.path.startsWith('/') : true",message="Ephemeral stores must have absolute paths."
 // +kubebuilder:validation:XValidation:rule="(has(self.pvc) && has(self.path)) ? !self.path.startsWith('/') : true",message="PVC path must be a file name only, with no slashes."
-// +kubebuilder:validation:XValidation:rule="has(self.path) && !self.path.startsWith('s3://') && !self.path.startsWith('gs://')",message="Online store does not support S3 or GS buckets."
+// +kubebuilder:validation:XValidation:rule="has(self.path) ? !(self.path.startsWith('s3://') || self.path.startsWith('gs://')) : true",message="Online store does not support S3 or GS buckets."
 type OnlineStoreFilePersistence struct {
 	Path      string     `json:"path,omitempty"`
 	PvcConfig *PvcConfig `json:"pvc,omitempty"`

diff --git a/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml b/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
@@ -709,8 +709,8 @@ spec:
                               rule: '(has(self.pvc) && has(self.path)) ? !self.path.startsWith(''/'')
                                 : true'
                             - message: Online store does not support S3 or GS buckets.
-                              rule: has(self.path) && !self.path.startsWith('s3://')
-                                && !self.path.startsWith('gs://')
+                              rule: 'has(self.path) ? !(self.path.startsWith(''s3://'')
+                                || self.path.startsWith(''gs://'')) : true'
                           store:
                             description: OnlineStoreDBStorePersistence configures
                               the DB store persistence for the offline store service
@@ -1979,8 +1979,8 @@ spec:
                                     : true'
                                 - message: Online store does not support S3 or GS
                                     buckets.
-                                  rule: has(self.path) && !self.path.startsWith('s3://')
-                                    && !self.path.startsWith('gs://')
+                                  rule: 'has(self.path) ? !(self.path.startsWith(''s3://'')
+                                    || self.path.startsWith(''gs://'')) : true'
                               store:
                                 description: OnlineStoreDBStorePersistence configures
                                   the DB store persistence for the offline store service

diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
@@ -717,8 +717,8 @@ spec:
                               rule: '(has(self.pvc) && has(self.path)) ? !self.path.startsWith(''/'')
                                 : true'
                             - message: Online store does not support S3 or GS buckets.
-                              rule: has(self.path) && !self.path.startsWith('s3://')
-                                && !self.path.startsWith('gs://')
+                              rule: 'has(self.path) ? !(self.path.startsWith(''s3://'')
+                                || self.path.startsWith(''gs://'')) : true'
                           store:
                             description: OnlineStoreDBStorePersistence configures
                               the DB store persistence for the offline store service
@@ -1987,8 +1987,8 @@ spec:
                                     : true'
                                 - message: Online store does not support S3 or GS
                                     buckets.
-                                  rule: has(self.path) && !self.path.startsWith('s3://')
-                                    && !self.path.startsWith('gs://')
+                                  rule: 'has(self.path) ? !(self.path.startsWith(''s3://'')
+                                    || self.path.startsWith(''gs://'')) : true'
                               store:
                                 description: OnlineStoreDBStorePersistence configures
                                   the DB store persistence for the offline store service