Skip to content

adding reconcilers for a service account #51

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.

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
merged 4 commits into from
May 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ rules:
- ""
resources:
- pods
- serviceaccounts
- services
verbs:
- create
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/doclingserve_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type DoclingServeReconciler struct {
// +kubebuilder:rbac:groups=docling.github.io,resources=doclingserves/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=docling.github.io,resources=doclingserves/finalizers,verbs=update
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=pods;services,verbs=update;create;get;list;watch
// +kubebuilder:rbac:groups=core,resources=pods;services;serviceaccounts,verbs=update;create;get;list;watch
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes;routes/custom-host,verbs=*

// Reconcile is part of the main kubernetes reconciliation loop which aims to
Expand Down Expand Up @@ -73,6 +73,7 @@ func (r *DoclingServeReconciler) Reconcile(ctx context.Context, req ctrl.Request
}

resourceReconcilers := []reconcilers.Reconciler{
reconcilers.NewServiceAccountReconciler(r.Client, r.Scheme),
reconcilers.NewDeploymentReconciler(r.Client, r.Scheme),
reconcilers.NewServiceReconciler(r.Client, r.Scheme),
reconcilers.NewRouteReconciler(r.Client, r.Scheme),
Expand Down
1 change: 1 addition & 0 deletions internal/reconcilers/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ func (r *DeploymentReconciler) Reconcile(ctx context.Context, doclingServe *v1al
Labels: labels,
},
Spec: corev1.PodSpec{
ServiceAccountName: serviceAccountName,
Containers: []corev1.Container{
{
Image: doclingServe.Spec.APIServer.Image,
Expand Down
45 changes: 45 additions & 0 deletions internal/reconcilers/service_account.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package reconcilers

import (
"context"

"github.io/opdev/docling-operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
logf "sigs.k8s.io/controller-runtime/pkg/log"
)

type ServiceAccountReconciler struct {
client.Client
Scheme *runtime.Scheme
}

const serviceAccountName = "docling-serve"

func NewServiceAccountReconciler(client client.Client, scheme *runtime.Scheme) *ServiceAccountReconciler {
return &ServiceAccountReconciler{
Client: client,
Scheme: scheme,
}
}

func (r *ServiceAccountReconciler) Reconcile(ctx context.Context, doclingServe *v1alpha1.DoclingServe) (bool, error) {
log := logf.FromContext(ctx)
serviceAccount := &corev1.ServiceAccount{ObjectMeta: metav1.ObjectMeta{Name: serviceAccountName, Namespace: doclingServe.Namespace}}
_, err := controllerutil.CreateOrUpdate(ctx, r.Client, serviceAccount, func() error {
serviceAccount.Labels = labelsForDocling(doclingServe.Name)
_ = ctrl.SetControllerReference(doclingServe, serviceAccount, r.Scheme)
return nil
})
if err != nil {
log.Error(err, "Error creating ServiceAccount", "ServiceAccount.Namespace", serviceAccount.Namespace, "ServiceAccount.Name", serviceAccount.Name)
return true, err
}

log.Info("Successfully created ServiceAccount", "ServiceAccount.Namespace", serviceAccount.Namespace, "ServiceAccount.Name", serviceAccount.Name)
return false, nil
}