Skip to content

fix: Operator - remove default replicas setting from Feast Deployment #5294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tchughesiv merged 1 commit into from
Apr 24, 2025
Merged

fix: Operator - remove default replicas setting from Feast Deployment #5294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_db_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ var _ = Describe("FeatureStore Controller - db storage services", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
svc := &corev1.Service{}
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_ephemeral_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
svc := &corev1.Service{}
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_kubernetes_auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ var _ = Describe("FeatureStore Controller-Kubernetes authorization", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
Expect(deploy.Spec.Template.Spec.Volumes).To(HaveLen(1))
Expand Down
6 changes: 1 addition & 5 deletions infra/feast-operator/internal/controller/featurestore_controller_loglevel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ var _ = Describe("FeatureStore Controller - Feast service LogLevel", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
command := services.GetRegistryContainer(*deploy).Command
Expand Down Expand Up @@ -244,7 +244,3 @@ var _ = Describe("FeatureStore Controller - Feast service LogLevel", func() {

})
})

func strPtr(str string) *string {
return &str
}
4 changes: 2 additions & 2 deletions infra/feast-operator/internal/controller/featurestore_controller_objectstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.InitContainers).To(HaveLen(1))
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(2))
Expand Down Expand Up @@ -279,7 +279,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(2))
Expect(services.GetRegistryContainer(*deploy)).NotTo(BeNil())
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_oidc_auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ var _ = Describe("FeatureStore Controller-OIDC authorization", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.InitContainers).To(HaveLen(1))
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
Expand Down
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_pvc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ var _ = Describe("FeatureStore Controller-Ephemeral services", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(3))
Expect(deploy.Spec.Template.Spec.Volumes).To(HaveLen(3))
Expand Down
17 changes: 15 additions & 2 deletions infra/feast-operator/internal/controller/featurestore_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,17 @@ var _ = Describe("FeatureStore Controller", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
Expect(deploy.Spec.Template.Spec.InitContainers).To(HaveLen(1))
Expect(deploy.Spec.Template.Spec.InitContainers[0].Args[0]).To(ContainSubstring("feast init"))
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))

deploy.Spec.Replicas = int32Ptr(3)
err = k8sClient.Update(ctx, deploy)
Expect(err).NotTo(HaveOccurred())

svc := &corev1.Service{}
err = k8sClient.Get(ctx, types.NamespacedName{
Name: feast.GetFeastServiceName(services.OnlineFeastType),
Expand Down Expand Up @@ -253,6 +257,7 @@ var _ = Describe("FeatureStore Controller", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(3)))
Expect(deploy.Spec.Template.Spec.InitContainers).To(HaveLen(1))
Expect(deploy.Spec.Template.Spec.InitContainers[0].Args[0]).To(ContainSubstring("git -c http.sslVerify=false clone"))
Expect(deploy.Spec.Template.Spec.InitContainers[0].Args[0]).To(ContainSubstring("git checkout " + ref))
Expand Down Expand Up @@ -650,7 +655,7 @@ var _ = Describe("FeatureStore Controller", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
Expand Down Expand Up @@ -1394,3 +1399,11 @@ func areEnvVarArraysEqual(arr1 []corev1.EnvVar, arr2 []corev1.EnvVar) bool {

return true
}

func strPtr(str string) *string {
return &str
}

func int32Ptr(value int32) *int32 {
return &value
}
2 changes: 1 addition & 1 deletion infra/feast-operator/internal/controller/featurestore_controller_tls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ var _ = Describe("FeatureStore Controller - Feast service TLS", func() {
Namespace: objMeta.Namespace,
}, deploy)
Expect(err).NotTo(HaveOccurred())
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
Expect(deploy.Spec.Replicas).To(Equal(int32Ptr(1)))
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(4))
svc := &corev1.Service{}
Expand Down
4 changes: 3 additions & 1 deletion infra/feast-operator/internal/controller/services/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,11 @@ func (feast *FeastServices) createPVC(pvcCreate *feastdevv1alpha1.PvcCreate, fea
}

func (feast *FeastServices) setDeployment(deploy *appsv1.Deployment) error {
replicas := deploy.Spec.Replicas

deploy.Labels = feast.getLabels()
deploy.Spec = appsv1.DeploymentSpec{
Replicas: &DefaultReplicas,
Replicas: replicas,
Selector: metav1.SetAsLabelSelector(deploy.GetLabels()),
Strategy: feast.getDeploymentStrategy(),
Template: corev1.PodTemplateSpec{
Expand Down
1 change: 0 additions & 1 deletion infra/feast-operator/internal/controller/services/services_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ const (
var (
DefaultImage = "quay.io/feastdev/feature-server:" + feastversion.FeastVersion
DefaultCronJobImage = "quay.io/openshift/origin-cli:4.17"
DefaultReplicas = int32(1)
DefaultPVCAccessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}
NameLabelKey = feastdevv1alpha1.GroupVersion.Group + "/name"
ServiceTypeLabelKey = feastdevv1alpha1.GroupVersion.Group + "/service-type"
Expand Down
Loading