Skip to content

Commit cde5760

Browse files
tchughesivtchughesiv
authored
feat: Operator will create k8s serviceaccount for each feast service (feast-dev#4767)
create a serviceaccount for each feast service Signed-off-by: Tommy Hughes <tohughes@redhat.com>
1 parent 7ec5b09 commit cde5760

5 files changed

Lines changed: 57 additions & 8 deletions

File tree

‎infra/feast-operator/config/rbac/role.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ rules:
2020
resources:
2121
- configmaps
2222
- persistentvolumeclaims
23+
- serviceaccounts
2324
- services
2425
verbs:
2526
- create

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,7 @@ rules:
20712071
resources:
20722072
- configmaps
20732073
- persistentvolumeclaims
2074+
- serviceaccounts
20742075
- services
20752076
verbs:
20762077
- create

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type FeatureStoreReconciler struct {
5353
//+kubebuilder:rbac:groups=feast.dev,resources=featurestores/status,verbs=get;update;patch
5454
//+kubebuilder:rbac:groups=feast.dev,resources=featurestores/finalizers,verbs=update
5555
//+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;create;update;watch;delete
56-
//+kubebuilder:rbac:groups=core,resources=services;configmaps;persistentvolumeclaims,verbs=get;list;create;update;watch;delete
56+
//+kubebuilder:rbac:groups=core,resources=services;configmaps;persistentvolumeclaims;serviceaccounts,verbs=get;list;create;update;watch;delete
5757

5858
// Reconcile is part of the main kubernetes reconciliation loop which aims to
5959
// move the current state of the cluster closer to the desired state.
@@ -143,6 +143,7 @@ func (r *FeatureStoreReconciler) SetupWithManager(mgr ctrl.Manager) error {
143143
Owns(&appsv1.Deployment{}).
144144
Owns(&corev1.Service{}).
145145
Owns(&corev1.PersistentVolumeClaim{}).
146+
Owns(&corev1.ServiceAccount{}).
146147
Watches(&feastdevv1alpha1.FeatureStore{}, handler.EnqueueRequestsFromMapFunc(r.mapFeastRefsToFeastRequests)).
147148
Complete(r)
148149
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ var _ = Describe("FeatureStore Controller", func() {
173173
Expect(err).NotTo(HaveOccurred())
174174
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
175175
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
176+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
176177
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
177178

178179
svc := &corev1.Service{}
@@ -216,6 +217,7 @@ var _ = Describe("FeatureStore Controller", func() {
216217
},
217218
deploy)
218219
Expect(err).NotTo(HaveOccurred())
220+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
219221
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
220222
Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(1))
221223
env := getFeatureStoreYamlEnvVar(deploy.Spec.Template.Spec.Containers[0].Env)
@@ -517,6 +519,7 @@ var _ = Describe("FeatureStore Controller", func() {
517519
Expect(err).NotTo(HaveOccurred())
518520
Expect(deploy.Spec.Replicas).To(Equal(&services.DefaultReplicas))
519521
Expect(controllerutil.HasControllerReference(deploy)).To(BeTrue())
522+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
520523
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
521524

522525
svc := &corev1.Service{}
@@ -555,6 +558,11 @@ var _ = Describe("FeatureStore Controller", func() {
555558
Expect(err).NotTo(HaveOccurred())
556559
Expect(deployList.Items).To(HaveLen(3))
557560

561+
saList := corev1.ServiceAccountList{}
562+
err = k8sClient.List(ctx, &saList, listOpts)
563+
Expect(err).NotTo(HaveOccurred())
564+
Expect(saList.Items).To(HaveLen(3))
565+
558566
svcList := corev1.ServiceList{}
559567
err = k8sClient.List(ctx, &svcList, listOpts)
560568
Expect(err).NotTo(HaveOccurred())
@@ -580,6 +588,7 @@ var _ = Describe("FeatureStore Controller", func() {
580588
},
581589
deploy)
582590
Expect(err).NotTo(HaveOccurred())
591+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
583592
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
584593
Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(1))
585594
env := getFeatureStoreYamlEnvVar(deploy.Spec.Template.Spec.Containers[0].Env)
@@ -613,6 +622,7 @@ var _ = Describe("FeatureStore Controller", func() {
613622
},
614623
deploy)
615624
Expect(err).NotTo(HaveOccurred())
625+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
616626
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
617627
Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(1))
618628
env = getFeatureStoreYamlEnvVar(deploy.Spec.Template.Spec.Containers[0].Env)
@@ -650,6 +660,7 @@ var _ = Describe("FeatureStore Controller", func() {
650660
},
651661
deploy)
652662
Expect(err).NotTo(HaveOccurred())
663+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
653664
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
654665
Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(3))
655666
Expect(deploy.Spec.Template.Spec.Containers[0].ImagePullPolicy).To(Equal(corev1.PullAlways))
@@ -799,6 +810,7 @@ var _ = Describe("FeatureStore Controller", func() {
799810
},
800811
deploy)
801812
Expect(err).NotTo(HaveOccurred())
813+
Expect(deploy.Spec.Template.Spec.ServiceAccountName).To(Equal(deploy.Name))
802814
Expect(deploy.Spec.Template.Spec.Containers).To(HaveLen(1))
803815
Expect(deploy.Spec.Template.Spec.Containers[0].Env).To(HaveLen(3))
804816
Expect(areEnvVarArraysEqual(deploy.Spec.Template.Spec.Containers[0].Env, []corev1.EnvVar{{Name: testEnvVarName, Value: testEnvVarValue}, {Name: services.FeatureStoreYamlEnvVar, Value: fsYamlStr}, {Name: "fieldRefName", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.namespace"}}}})).To(BeTrue())

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

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,27 +88,33 @@ func (feast *FeastServices) Deploy() error {
8888
}
8989

9090
func (feast *FeastServices) deployFeastServiceByType(feastType FeastServiceType) error {
91-
if err := feast.createService(feastType); err != nil {
92-
return feast.setFeastServiceCondition(err, feastType)
93-
}
94-
if err := feast.createDeployment(feastType); err != nil {
95-
return feast.setFeastServiceCondition(err, feastType)
96-
}
9791
if pvcCreate, shouldCreate := shouldCreatePvc(feast.FeatureStore, feastType); shouldCreate {
9892
if err := feast.createPVC(pvcCreate, feastType); err != nil {
9993
return feast.setFeastServiceCondition(err, feastType)
10094
}
10195
} else {
10296
_ = feast.deleteOwnedFeastObj(feast.initPVC(feastType))
10397
}
98+
if err := feast.createServiceAccount(feastType); err != nil {
99+
return feast.setFeastServiceCondition(err, feastType)
100+
}
101+
if err := feast.createDeployment(feastType); err != nil {
102+
return feast.setFeastServiceCondition(err, feastType)
103+
}
104+
if err := feast.createService(feastType); err != nil {
105+
return feast.setFeastServiceCondition(err, feastType)
106+
}
104107
return feast.setFeastServiceCondition(nil, feastType)
105108
}
106109

107110
func (feast *FeastServices) removeFeastServiceByType(feastType FeastServiceType) error {
111+
if err := feast.deleteOwnedFeastObj(feast.initFeastSvc(feastType)); err != nil {
112+
return err
113+
}
108114
if err := feast.deleteOwnedFeastObj(feast.initFeastDeploy(feastType)); err != nil {
109115
return err
110116
}
111-
if err := feast.deleteOwnedFeastObj(feast.initFeastSvc(feastType)); err != nil {
117+
if err := feast.deleteOwnedFeastObj(feast.initFeastSA(feastType)); err != nil {
112118
return err
113119
}
114120
if err := feast.deleteOwnedFeastObj(feast.initPVC(feastType)); err != nil {
@@ -131,6 +137,19 @@ func (feast *FeastServices) createService(feastType FeastServiceType) error {
131137
return nil
132138
}
133139

140+
func (feast *FeastServices) createServiceAccount(feastType FeastServiceType) error {
141+
logger := log.FromContext(feast.Context)
142+
sa := feast.initFeastSA(feastType)
143+
if op, err := controllerutil.CreateOrUpdate(feast.Context, feast.Client, sa, controllerutil.MutateFn(func() error {
144+
return feast.setServiceAccount(sa, feastType)
145+
})); err != nil {
146+
return err
147+
} else if op == controllerutil.OperationResultCreated || op == controllerutil.OperationResultUpdated {
148+
logger.Info("Successfully reconciled", "ServiceAccount", sa.Name, "operation", op)
149+
}
150+
return nil
151+
}
152+
134153
func (feast *FeastServices) createDeployment(feastType FeastServiceType) error {
135154
logger := log.FromContext(feast.Context)
136155
deploy := feast.initFeastDeploy(feastType)
@@ -173,6 +192,7 @@ func (feast *FeastServices) setDeployment(deploy *appsv1.Deployment, feastType F
173192
deploySettings := FeastServiceConstants[feastType]
174193
serviceConfigs := feast.getServiceConfigs(feastType)
175194
defaultServiceConfigs := serviceConfigs.DefaultConfigs
195+
sa := feast.initFeastSA(feastType)
176196

177197
// standard configs are applied here
178198
probeHandler := corev1.ProbeHandler{
@@ -188,6 +208,7 @@ func (feast *FeastServices) setDeployment(deploy *appsv1.Deployment, feastType F
188208
Labels: deploy.GetLabels(),
189209
},
190210
Spec: corev1.PodSpec{
211+
ServiceAccountName: sa.Name,
191212
Containers: []corev1.Container{
192213
{
193214
Name: string(feastType),
@@ -252,6 +273,11 @@ func (feast *FeastServices) setService(svc *corev1.Service, feastType FeastServi
252273
return controllerutil.SetControllerReference(feast.FeatureStore, svc, feast.Scheme)
253274
}
254275

276+
func (feast *FeastServices) setServiceAccount(sa *corev1.ServiceAccount, feastType FeastServiceType) error {
277+
sa.Labels = feast.getLabels(feastType)
278+
return controllerutil.SetControllerReference(feast.FeatureStore, sa, feast.Scheme)
279+
}
280+
255281
func (feast *FeastServices) createNewPVC(pvcCreate *feastdevv1alpha1.PvcCreate, feastType FeastServiceType) (*corev1.PersistentVolumeClaim, error) {
256282
pvc := feast.initPVC(feastType)
257283

@@ -426,6 +452,14 @@ func (feast *FeastServices) initFeastSvc(feastType FeastServiceType) *corev1.Ser
426452
return svc
427453
}
428454

455+
func (feast *FeastServices) initFeastSA(feastType FeastServiceType) *corev1.ServiceAccount {
456+
sa := &corev1.ServiceAccount{
457+
ObjectMeta: feast.GetObjectMeta(feastType),
458+
}
459+
sa.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("ServiceAccount"))
460+
return sa
461+
}
462+
429463
func (feast *FeastServices) initPVC(feastType FeastServiceType) *corev1.PersistentVolumeClaim {
430464
pvc := &corev1.PersistentVolumeClaim{
431465
ObjectMeta: feast.GetObjectMeta(feastType),

0 commit comments

Comments
 (0)