Merge branch 'master' into feature/operator-e2e-test

# Conflicts:
#	infra/feast-operator/config/samples/v1alpha1_featurestore_db_persistence.yaml

infra/feast-operator/config/samples/v1alpha1_featurestore_db_persistence.yaml

@@ -1,3 +1,23 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: postgres-secret
+  namespace: test
+stringData:
+  postgres-secret-parameters: |
+    path: postgresql+psycopg://postgres:mysecretpassword@127.0.0.1:55001/feast
+    cache_ttl_seconds: 60
+    sqlalchemy_config_kwargs:
+      echo: false
+      pool_pre_ping: true
+  postgres: |
+    host: 127.0.0.1
+    port: 55001
+    database: feast
+    db_schema: public
+    user: postgres
+    password: mysecretpassword
+---
 apiVersion: feast.dev/v1alpha1
 kind: FeatureStore
 metadata:
@@ -12,31 +32,11 @@ spec:
           type: postgres
           secretRef:
             name: postgres-secret
-          secretKeyName: postgres-secret-parameters   # optional
     registry:
       local:
         persistence:
           store:
             type: sql
             secretRef:
               name: postgres-secret
-            secretKeyName: postgres-secret-parameters   # optional
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: postgres-secret
-stringData:
-  postgres-secret-parameters: |
-    path: postgresql+postgresql://postgres:mysecretpassword@127.0.0.1:55001/feast
-    cache_ttl_seconds: 60
-    sqlalchemy_config_kwargs:
-      echo: false
-      pool_pre_ping: true
-  postgres: |
-    host: 127.0.0.1
-    port: 55001
-    database: feast
-    db_schema: public
-    user: postgres
-    password: mysecretpassword
+            secretKeyName: postgres-secret-parameters   # optional, will use store.type by default as the SecretKeyName if none is specified, in this case that's "sql"