Skip to content

Commit f09339e

Browse files
tchughesivtchughesiv
authored
fix: Fix db store types in Operator CRD (feast-dev#4798)
fix dbstore types Signed-off-by: Tommy Hughes <tohughes@redhat.com>
1 parent 1174239 commit f09339e

6 files changed

Lines changed: 57 additions & 33 deletions

File tree

‎infra/feast-operator/api/v1alpha1/featurestore_types.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ var ValidOfflineStoreFilePersistenceTypes = []string{
9696
// OfflineStoreDBStorePersistence configures the DB store persistence for the offline store service
9797
type OfflineStoreDBStorePersistence struct {
9898
// +kubebuilder:validation:Enum=snowflake.offline;bigquery;redshift;spark;postgres;feast_trino.trino.TrinoOfflineStore;redis
99-
Type string `json:"type,omitempty"`
100-
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
101-
SecretKeyName string `json:"secretKeyName,omitempty"`
99+
Type string `json:"type"`
100+
SecretRef corev1.LocalObjectReference `json:"secretRef"`
101+
SecretKeyName string `json:"secretKeyName,omitempty"`
102102
}
103103

104104
var ValidOfflineStoreDBStorePersistenceTypes = []string{
@@ -136,9 +136,9 @@ type OnlineStoreFilePersistence struct {
136136
// OnlineStoreDBStorePersistence configures the DB store persistence for the offline store service
137137
type OnlineStoreDBStorePersistence struct {
138138
// +kubebuilder:validation:Enum=snowflake.online;redis;ikv;datastore;dynamodb;bigtable;postgres;cassandra;mysql;hazelcast;singlestore
139-
Type string `json:"type,omitempty"`
140-
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
141-
SecretKeyName string `json:"secretKeyName,omitempty"`
139+
Type string `json:"type"`
140+
SecretRef corev1.LocalObjectReference `json:"secretRef"`
141+
SecretKeyName string `json:"secretKeyName,omitempty"`
142142
}
143143

144144
var ValidOnlineStoreDBStorePersistenceTypes = []string{
@@ -181,9 +181,9 @@ type RegistryFilePersistence struct {
181181
// RegistryDBStorePersistence configures the DB store persistence for the registry service
182182
type RegistryDBStorePersistence struct {
183183
// +kubebuilder:validation:Enum=sql;snowflake.registry
184-
Type string `json:"type,omitempty"`
185-
SecretRef *corev1.LocalObjectReference `json:"secretRef,omitempty"`
186-
SecretKeyName string `json:"secretKeyName,omitempty"`
184+
Type string `json:"type"`
185+
SecretRef corev1.LocalObjectReference `json:"secretRef"`
186+
SecretKeyName string `json:"secretKeyName,omitempty"`
187187
}
188188

189189
var ValidRegistryDBStorePersistenceTypes = []string{

‎infra/feast-operator/api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 6 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ spec:
299299
- feast_trino.trino.TrinoOfflineStore
300300
- redis
301301
type: string
302+
required:
303+
- secretRef
304+
- type
302305
type: object
303306
type: object
304307
x-kubernetes-validations:
@@ -614,6 +617,9 @@ spec:
614617
- hazelcast
615618
- singlestore
616619
type: string
620+
required:
621+
- secretRef
622+
- type
617623
type: object
618624
type: object
619625
x-kubernetes-validations:
@@ -937,6 +943,9 @@ spec:
937943
- sql
938944
- snowflake.registry
939945
type: string
946+
required:
947+
- secretRef
948+
- type
940949
type: object
941950
type: object
942951
resources:
@@ -1292,6 +1301,9 @@ spec:
12921301
- feast_trino.trino.TrinoOfflineStore
12931302
- redis
12941303
type: string
1304+
required:
1305+
- secretRef
1306+
- type
12951307
type: object
12961308
type: object
12971309
x-kubernetes-validations:
@@ -1612,6 +1624,9 @@ spec:
16121624
- hazelcast
16131625
- singlestore
16141626
type: string
1627+
required:
1628+
- secretRef
1629+
- type
16151630
type: object
16161631
type: object
16171632
x-kubernetes-validations:
@@ -1943,6 +1958,9 @@ spec:
19431958
- sql
19441959
- snowflake.registry
19451960
type: string
1961+
required:
1962+
- secretRef
1963+
- type
19461964
type: object
19471965
type: object
19481966
resources:

‎infra/feast-operator/dist/install.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,9 @@ spec:
307307
- feast_trino.trino.TrinoOfflineStore
308308
- redis
309309
type: string
310+
required:
311+
- secretRef
312+
- type
310313
type: object
311314
type: object
312315
x-kubernetes-validations:
@@ -622,6 +625,9 @@ spec:
622625
- hazelcast
623626
- singlestore
624627
type: string
628+
required:
629+
- secretRef
630+
- type
625631
type: object
626632
type: object
627633
x-kubernetes-validations:
@@ -945,6 +951,9 @@ spec:
945951
- sql
946952
- snowflake.registry
947953
type: string
954+
required:
955+
- secretRef
956+
- type
948957
type: object
949958
type: object
950959
resources:
@@ -1300,6 +1309,9 @@ spec:
13001309
- feast_trino.trino.TrinoOfflineStore
13011310
- redis
13021311
type: string
1312+
required:
1313+
- secretRef
1314+
- type
13031315
type: object
13041316
type: object
13051317
x-kubernetes-validations:
@@ -1620,6 +1632,9 @@ spec:
16201632
- hazelcast
16211633
- singlestore
16221634
type: string
1635+
required:
1636+
- secretRef
1637+
- type
16231638
type: object
16241639
type: object
16251640
x-kubernetes-validations:
@@ -1951,6 +1966,9 @@ spec:
19511966
- sql
19521967
- snowflake.registry
19531968
type: string
1969+
required:
1970+
- secretRef
1971+
- type
19541972
type: object
19551973
type: object
19561974
resources:

‎infra/feast-operator/internal/controller/services/repo_config_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ var _ = Describe("Repo Config", func() {
190190
Persistence: &feastdevv1alpha1.OfflineStorePersistence{
191191
DBPersistence: &feastdevv1alpha1.OfflineStoreDBStorePersistence{
192192
Type: string(OfflineDBPersistenceSnowflakeConfigType),
193-
SecretRef: &corev1.LocalObjectReference{
193+
SecretRef: corev1.LocalObjectReference{
194194
Name: "offline-test-secret",
195195
},
196196
},
@@ -200,7 +200,7 @@ var _ = Describe("Repo Config", func() {
200200
Persistence: &feastdevv1alpha1.OnlineStorePersistence{
201201
DBPersistence: &feastdevv1alpha1.OnlineStoreDBStorePersistence{
202202
Type: string(OnlineDBPersistenceSnowflakeConfigType),
203-
SecretRef: &corev1.LocalObjectReference{
203+
SecretRef: corev1.LocalObjectReference{
204204
Name: "online-test-secret",
205205
},
206206
},
@@ -211,7 +211,7 @@ var _ = Describe("Repo Config", func() {
211211
Persistence: &feastdevv1alpha1.RegistryPersistence{
212212
DBPersistence: &feastdevv1alpha1.RegistryDBStorePersistence{
213213
Type: string(RegistryDBPersistenceSnowflakeConfigType),
214-
SecretRef: &corev1.LocalObjectReference{
214+
SecretRef: corev1.LocalObjectReference{
215215
Name: "registry-test-secret",
216216
},
217217
},

‎infra/feast-operator/internal/controller/services/services.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (feast *FeastServices) validateRegistryPersistence(registryPersistence *fea
110110
return err
111111
}
112112

113-
if dbPersistence.SecretRef != nil {
113+
if len(dbPersistence.SecretRef.Name) > 0 {
114114
secretRef := dbPersistence.SecretRef.Name
115115
if _, err := feast.getSecret(secretRef); err != nil {
116116
return err
@@ -131,7 +131,7 @@ func (feast *FeastServices) validateOnlineStorePersistence(onlinePersistence *fe
131131
return err
132132
}
133133

134-
if dbPersistence.SecretRef != nil {
134+
if len(dbPersistence.SecretRef.Name) > 0 {
135135
secretRef := dbPersistence.SecretRef.Name
136136
if _, err := feast.getSecret(secretRef); err != nil {
137137
return err
@@ -158,7 +158,7 @@ func (feast *FeastServices) validateOfflineStorePersistence(offlinePersistence *
158158
return err
159159
}
160160

161-
if dbPersistence.SecretRef != nil {
161+
if len(dbPersistence.SecretRef.Name) > 0 {
162162
secretRef := dbPersistence.SecretRef.Name
163163
if _, err := feast.getSecret(secretRef); err != nil {
164164
return err

0 commit comments

Comments
 (0)