single deployment refactor

Signed-off-by: Tommy Hughes <[email protected]>
feast-dev · Dec 19, 2024 · 29cdbf5 · 29cdbf5
1 parent 3f21bcb
commit 29cdbf5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/infra/feast-operator/api/v1alpha1/featurestore_types.go b/infra/feast-operator/api/v1alpha1/featurestore_types.go
@@ -65,7 +65,7 @@ type FeatureStoreSpec struct {
 	AuthzConfig  *AuthzConfig          `json:"authz,omitempty"`
 }
 
-// FeatureStoreServices defines the desired feast service deployments. ephemeral registry is deployed by default.
+// FeatureStoreServices defines the desired feast services. An ephemeral registry is deployed by default.
 type FeatureStoreServices struct {
 	OfflineStore *OfflineStore `json:"offlineStore,omitempty"`
 	OnlineStore  *OnlineStore  `json:"onlineStore,omitempty"`
@@ -239,7 +239,7 @@ type PvcConfig struct {
 }
 
 // PvcCreate defines the immutable settings to create a new PVC mounted at the given path.
-// The PVC name is the same as the associated deployment name.
+// The PVC name is the same as the associated deployment & feast service name.
 // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="PvcCreate is immutable"
 type PvcCreate struct {
 	// StorageClassName is the name of an existing StorageClass to which this persistent volume belongs. Empty value

diff --git a/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml b/infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
@@ -101,8 +101,8 @@ spec:
                 pattern: ^[A-Za-z0-9][A-Za-z0-9_]*$
                 type: string
               services:
-                description: FeatureStoreServices defines the desired feast service
-                  deployments. ephemeral registry is deployed by default.
+                description: FeatureStoreServices defines the desired feast services.
+                  An ephemeral registry is deployed by default.
                 properties:
                   offlineStore:
                     description: OfflineStore configures the deployed offline store
@@ -1345,8 +1345,8 @@ spec:
                     pattern: ^[A-Za-z0-9][A-Za-z0-9_]*$
                     type: string
                   services:
-                    description: FeatureStoreServices defines the desired feast service
-                      deployments. ephemeral registry is deployed by default.
+                    description: FeatureStoreServices defines the desired feast services.
+                      An ephemeral registry is deployed by default.
                     properties:
                       offlineStore:
                         description: OfflineStore configures the deployed offline

diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
@@ -109,8 +109,8 @@ spec:
                 pattern: ^[A-Za-z0-9][A-Za-z0-9_]*$
                 type: string
               services:
-                description: FeatureStoreServices defines the desired feast service
-                  deployments. ephemeral registry is deployed by default.
+                description: FeatureStoreServices defines the desired feast services.
+                  An ephemeral registry is deployed by default.
                 properties:
                   offlineStore:
                     description: OfflineStore configures the deployed offline store
@@ -1353,8 +1353,8 @@ spec:
                     pattern: ^[A-Za-z0-9][A-Za-z0-9_]*$
                     type: string
                   services:
-                    description: FeatureStoreServices defines the desired feast service
-                      deployments. ephemeral registry is deployed by default.
+                    description: FeatureStoreServices defines the desired feast services.
+                      An ephemeral registry is deployed by default.
                     properties:
                       offlineStore:
                         description: OfflineStore configures the deployed offline

diff --git a/infra/feast-operator/internal/controller/services/services.go b/infra/feast-operator/internal/controller/services/services.go
@@ -419,7 +419,7 @@ func (feast *FeastServices) getContainerCommand(feastType FeastServiceType) []st
 
 func (feast *FeastServices) setRegistryClientInitContainer(podSpec *corev1.PodSpec) {
 	hostname := feast.Handler.FeatureStore.Status.ServiceHostnames.Registry
-	// add grpc init container if registry is not configured via 'remote.hostname'
+	// add grpc init container if remote registry reference (feastRef) is configured
 	if len(hostname) > 0 && feast.IsRemoteRefRegistry() {
 		grpcurlFlag := "-plaintext"
 		hostSplit := strings.Split(hostname, ":")
@@ -563,17 +563,17 @@ func (feast *FeastServices) setServiceHostnames() error {
 	feast.Handler.FeatureStore.Status.ServiceHostnames = feastdevv1alpha1.ServiceHostnames{}
 	domain := svcDomain + ":"
 	if feast.isOfflinStore() {
-		objMeta := feast.GetObjectMetaType(OfflineFeastType)
+		objMeta := feast.initFeastSvc(OfflineFeastType)
 		feast.Handler.FeatureStore.Status.ServiceHostnames.OfflineStore = objMeta.Name + "." + objMeta.Namespace + domain +
 			getPortStr(feast.Handler.FeatureStore.Status.Applied.Services.OfflineStore.TLS)
 	}
 	if feast.isOnlinStore() {
-		objMeta := feast.GetObjectMetaType(OnlineFeastType)
+		objMeta := feast.initFeastSvc(OnlineFeastType)
 		feast.Handler.FeatureStore.Status.ServiceHostnames.OnlineStore = objMeta.Name + "." + objMeta.Namespace + domain +
 			getPortStr(feast.Handler.FeatureStore.Status.Applied.Services.OnlineStore.TLS)
 	}
 	if feast.isLocalRegistry() {
-		objMeta := feast.GetObjectMetaType(RegistryFeastType)
+		objMeta := feast.initFeastSvc(RegistryFeastType)
 		feast.Handler.FeatureStore.Status.ServiceHostnames.Registry = objMeta.Name + "." + objMeta.Namespace + domain +
 			getPortStr(feast.Handler.FeatureStore.Status.Applied.Services.Registry.Local.TLS)
 	} else if feast.isRemoteRegistry() {