Skip to content

dbuser: add events to db user custom resource #33

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

dbuser: add events to db user custom resource #33

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
7 changes: 7 additions & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ rules:
verbs:
- create
- patch
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- apiGroups:
- ""
resources:
Expand Down
10 changes: 10 additions & 0 deletions controllers/databaseuser_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ import (
"net/http"
"time"

corev1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
utilerror "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand All @@ -42,12 +44,14 @@ type DatabaseUserReconciler struct {
client.Client
Scheme *runtime.Scheme
GodoClient *godo.Client
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=databases.digitalocean.com,resources=databaseusers,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups=databases.digitalocean.com,resources=databaseusers/status,verbs=get;update;patch
//+kubebuilder:rbac:groups=databases.digitalocean.com,resources=databaseusers/finalizers,verbs=update
//+kubebuilder:rbac:groups="",resources=secrets,verbs=create;patch
//+kubebuilder:rbac:groups="",resources=events,verbs=create;patch

// Reconcile is part of the main kubernetes reconciliation loop which aims to
// move the current state of the cluster closer to the desired state.
Expand Down Expand Up @@ -94,8 +98,10 @@ func (r *DatabaseUserReconciler) Reconcile(ctx context.Context, req ctrl.Request

if len(errs) == 0 {
if updated {
r.Recorder.Event(&user, corev1.EventTypeNormal, "Updated", "database user update succeeded")
Copy link
Contributor Author

@varshavaradarajan varshavaradarajan Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the reason should be DBUser specific or should follow k8s conventions as much as possible.

ll.Info("DatabaseUser update succeeded")
} else {
r.Recorder.Event(&user, corev1.EventTypeNormal, "NoUpdate", "database user update unnecessary")
ll.Info("no DatabaseUser update necessary")
}
}
Expand Down Expand Up @@ -149,6 +155,7 @@ func (r *DatabaseUserReconciler) Reconcile(ctx context.Context, req ctrl.Request
// quick retry in those cases so we don't exponentially back off.
if clusterStatus == "" || clusterStatus == "creating" {
ll.Info("database is still creating; waiting to create user")
r.Recorder.Event(&user, corev1.EventTypeNormal, "WaitingForDBUser", "database is still creating, waiting to create user")
return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
}

Expand Down Expand Up @@ -186,6 +193,7 @@ func (r *DatabaseUserReconciler) reconcileDBUser(ctx context.Context, clusterUUI
dbUser, _, err = r.GodoClient.Databases.CreateUser(ctx, clusterUUID, createReq)
if err != nil {
ll.Error(err, "unable to create user")
r.Recorder.Eventf(user, corev1.EventTypeWarning, "FailedCreate", "failed to create user: %v", err)
return ctrl.Result{}, fmt.Errorf("creating DB user: %v", err)
}
}
Expand All @@ -196,6 +204,7 @@ func (r *DatabaseUserReconciler) reconcileDBUser(ctx context.Context, clusterUUI
err = r.ensureOwnedObjects(ctx, user, dbUser)
if err != nil {
ll.Error(err, "unable to ensure user-related objects")
r.Recorder.Eventf(user, corev1.EventTypeWarning, "FailedCreate", "failed to ensure user related objects: %v", err)
return ctrl.Result{}, fmt.Errorf("ensuring user-related objects: %v", err)
}

Expand Down Expand Up @@ -230,6 +239,7 @@ func (r *DatabaseUserReconciler) reconcileDeletedDBUser(ctx context.Context, clu
_, err := r.GodoClient.Databases.DeleteUser(ctx, clusterUUID, user.Spec.Username)
if err != nil {
ll.Error(err, "unable to delete user")
r.Recorder.Eventf(user, corev1.EventTypeWarning, "FailedDelete", "failed to delete user: %v", err)
return ctrl.Result{}, fmt.Errorf("deleting user: %v", err)
}
controllerutil.RemoveFinalizer(user, finalizerName)
Expand Down
1 change: 1 addition & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ func main() {
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
GodoClient: godoClient,
Recorder: mgr.GetEventRecorderFor("db-user-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "DatabaseUser")
os.Exit(1)
Expand Down