Skip to content

Commit

Permalink
Remove RegisterEvents wrapper (#1880)
Browse files Browse the repository at this point in the history 
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
  • Loading branch information
@dvaldivia
dvaldivia committed Nov 21, 2023
1 parent 2dc44a7 commit c5b02c4
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 60 deletions.
4 changes: 2 additions & 2 deletions pkg/controller/console.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (c *Controller) checkConsoleSvc(ctx context.Context, tenant *miniov2.Tenant
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "SvcCreated", "Console Service Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "SvcCreated", "Console Service Created")
} else {
return err
}
Expand Down Expand Up @@ -94,7 +94,7 @@ func (c *Controller) checkConsoleSvc(ctx context.Context, tenant *miniov2.Tenant
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "Updated", "Console Service Updated")
c.recorder.Event(tenant, corev1.EventTypeNormal, "Updated", "Console Service Updated")
}
return err
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/custom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@ func (c *Controller) getCustomCertificates(ctx context.Context, tenant *miniov2.
expiresInHuman := fmt.Sprintf("%v days, %v hours, %v minutes, %v seconds", expiresInDays, expiresInHours, expiresInMinutes, expiresInSeconds)

if expiresInDays >= 10 && expiresInDays < 30 {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "CertificateExpiring", fmt.Sprintf("%s certificate '%s' is expiring in %d days", certType, secret.Name, expiresInDays))
c.recorder.Event(tenant, corev1.EventTypeWarning, "CertificateExpiring", fmt.Sprintf("%s certificate '%s' is expiring in %d days", certType, secret.Name, expiresInDays))
}
if expiresInDays > 0 && expiresInDays < 10 {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "CertificateExpiryImminent", fmt.Sprintf("%s certificate '%s' is expiring in %d days", certType, secret.Name, expiresInDays))
c.recorder.Event(tenant, corev1.EventTypeWarning, "CertificateExpiryImminent", fmt.Sprintf("%s certificate '%s' is expiring in %d days", certType, secret.Name, expiresInDays))
}
if expiresInDays > 0 && expiresInDays < 1 {
expiresInHuman = fmt.Sprintf("%v hours, %v minutes, and %v seconds", expiresInHours, expiresInMinutes, expiresInSeconds)
}
if expiresInDays <= 0 {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "CertificateExpired", fmt.Sprintf("%s certificate '%s' has expired", certType, secret.Name))
c.recorder.Event(tenant, corev1.EventTypeWarning, "CertificateExpired", fmt.Sprintf("%s certificate '%s' has expired", certType, secret.Name))
expiresInHuman = "EXPIRED"
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/decomission.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (c *Controller) checkForPoolDecommission(ctx context.Context, key string, t
}

for _, ssName := range poolNamesRemoved {
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "PoolRemoved", fmt.Sprintf("Tenant pool %s removed", ssName))
c.recorder.Event(tenant, corev1.EventTypeNormal, "PoolRemoved", fmt.Sprintf("Tenant pool %s removed", ssName))
if err = c.kubeClientSet.AppsV1().StatefulSets(tenant.Namespace).Delete(ctx, ssName, metav1.DeleteOptions{}); err != nil {
if k8serrors.IsNotFound(err) {
continue
Expand Down
26 changes: 0 additions & 26 deletions pkg/controller/events.go
View file

This file was deleted.

18 changes: 9 additions & 9 deletions pkg/controller/kes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ func (c *Controller) createKESCSR(ctx context.Context, tenant *miniov2.Tenant) e
klog.Errorf("Unexpected error during the creation of the csr/%s: %v", tenant.KESCSRName(), err)
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "CSRCreated", "KES CSR Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "CSRCreated", "KES CSR Created")

// fetch certificate from CSR
certbytes, err := c.fetchCertificate(ctx, tenant.KESCSRName())
if err != nil {
klog.Errorf("Unexpected error during the creation of the csr/%s: %v", tenant.KESCSRName(), err)
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "CSRFailed", fmt.Sprintf("KES CSR Failed to create: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "CSRFailed", fmt.Sprintf("KES CSR Failed to create: %s", err))
return err
}

Expand Down Expand Up @@ -214,10 +214,10 @@ func (c *Controller) checkKESStatus(ctx context.Context, tenant *miniov2.Tenant,
klog.V(2).Infof("Creating a new Headless Service for cluster %q", nsName)
svc = services.NewHeadlessForKES(tenant)
if _, err = c.kubeClientSet.CoreV1().Services(svc.Namespace).Create(ctx, svc, cOpts); err != nil {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "SvcFailed", fmt.Sprintf("KES Headless Service failed to create: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "SvcFailed", fmt.Sprintf("KES Headless Service failed to create: %s", err))
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "SvcCreated", "KES Headless Service created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "SvcCreated", "KES Headless Service created")
} else {
return err
}
Expand All @@ -244,10 +244,10 @@ func (c *Controller) checkKESStatus(ctx context.Context, tenant *miniov2.Tenant,
klog.V(2).Infof("Creating a new KES StatefulSet for %q", nsName)
if _, err = c.kubeClientSet.AppsV1().StatefulSets(tenant.Namespace).Create(ctx, ks, cOpts); err != nil {
klog.V(2).Infof(err.Error())
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "StsFailed", fmt.Sprintf("KES Statefulset failed to create: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "StsFailed", fmt.Sprintf("KES Statefulset failed to create: %s", err))
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "StsCreated", "KES Statefulset Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "StsCreated", "KES Statefulset Created")
} else {
return err
}
Expand All @@ -265,10 +265,10 @@ func (c *Controller) checkKESStatus(ctx context.Context, tenant *miniov2.Tenant,
return err
}
if _, err = c.kubeClientSet.AppsV1().StatefulSets(tenant.Namespace).Update(ctx, ks, uOpts); err != nil {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "StsFailed", fmt.Sprintf("KES Statefulset failed to update: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "StsFailed", fmt.Sprintf("KES Statefulset failed to update: %s", err))
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "StsUpdated", "KES Statefulset Updated")
c.recorder.Event(tenant, corev1.EventTypeNormal, "StsUpdated", "KES Statefulset Updated")
}
}
}
Expand All @@ -286,7 +286,7 @@ func (c *Controller) checkAndCreateMinIOClientCertificates(ctx context.Context,
klog.V(2).Infof("Creating a new Client Certificate for MinIO, cluster %q", nsName)
if err = c.createMinIOClientCertificates(ctx, tenant); err != nil {
// we want to re-queue this tenant so we can re-check for the health at a later stage
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "CertFailed", fmt.Sprintf("KES MinIO Client Certificate failed to create: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "CertFailed", fmt.Sprintf("KES MinIO Client Certificate failed to create: %s", err))
return err
}
return errors.New("waiting for minio client cert")
Expand Down
18 changes: 9 additions & 9 deletions pkg/controller/main-controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ func (c *Controller) syncHandler(key string) (Result, error) {
if _, err2 := c.updateTenantStatus(ctx, tenant, err.Error(), 0); err2 != nil {
klog.V(2).Infof(err2.Error())
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "MissingCreds", "Tenant is missing root credentials")
c.recorder.Event(tenant, corev1.EventTypeWarning, "MissingCreds", "Tenant is missing root credentials")
return WrapResult(Result{}, nil)
}
return WrapResult(Result{}, err)
Expand Down Expand Up @@ -920,7 +920,7 @@ func (c *Controller) syncHandler(key string) (Result, error) {
if err != nil {
return WrapResult(Result{}, err)
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "SvcCreated", "Headless Service created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "SvcCreated", "Headless Service created")
} else {
return WrapResult(Result{}, err)
}
Expand Down Expand Up @@ -1088,7 +1088,7 @@ func (c *Controller) syncHandler(key string) (Result, error) {
if err != nil {
return WrapResult(Result{}, err)
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "PoolCreated", fmt.Sprintf("Tenant pool %s created", pool.Name))
c.recorder.Event(tenant, corev1.EventTypeNormal, "PoolCreated", fmt.Sprintf("Tenant pool %s created", pool.Name))
// Report the pool is properly created
tenant.Status.Pools[i].State = miniov2.PoolCreated
// mark we are adding a new pool to the next block can act accordingly
Expand Down Expand Up @@ -1249,7 +1249,7 @@ func (c *Controller) syncHandler(key string) (Result, error) {
// Update failed, nothing needs to be changed in the container
return WrapResult(Result{}, err)
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "Inplace update is disabled, falling back to performing only statefulset update.", fmt.Sprintf("Tenant %s", tenant.Name))
c.recorder.Event(tenant, corev1.EventTypeWarning, "Inplace update is disabled, falling back to performing only statefulset update.", fmt.Sprintf("Tenant %s", tenant.Name))
}
if err == nil {
if us.CurrentVersion != us.UpdatedVersion {
Expand Down Expand Up @@ -1297,7 +1297,7 @@ func (c *Controller) syncHandler(key string) (Result, error) {
if _, err = c.kubeClientSet.AppsV1().StatefulSets(tenant.Namespace).Update(ctx, ss, uOpts); err != nil {
return WrapResult(Result{}, err)
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "PoolUpdated", fmt.Sprintf("Tenant pool %s updated", pool.Name))
c.recorder.Event(tenant, corev1.EventTypeNormal, "PoolUpdated", fmt.Sprintf("Tenant pool %s updated", pool.Name))
}

}
Expand Down Expand Up @@ -1404,22 +1404,22 @@ func (c *Controller) syncHandler(key string) (Result, error) {
if !tenant.Status.ProvisionedUsers && len(tenant.Spec.Users) > 0 {
if err := c.createUsers(ctx, tenant, tenantConfiguration); err != nil {
klog.V(2).Infof("Unable to create MinIO users: %v", err)
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "UsersCreatedFailed", fmt.Sprintf("Users creation failed: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "UsersCreatedFailed", fmt.Sprintf("Users creation failed: %s", err))
// retry after 5sec
return WrapResult(Result{RequeueAfter: time.Second * 5}, nil)
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "UsersCreated", "Users created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "UsersCreated", "Users created")
}

// Ensure we are only creating the bucket
if len(tenant.Spec.Buckets) > 0 {
if create, err := c.createBuckets(ctx, tenant, tenantConfiguration); err != nil {
klog.V(2).Infof("Unable to create MinIO buckets: %v", err)
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "BucketsCreatedFailed", fmt.Sprintf("Buckets creation failed: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "BucketsCreatedFailed", fmt.Sprintf("Buckets creation failed: %s", err))
// retry after 5sec
return WrapResult(Result{RequeueAfter: time.Second * 5}, err)
} else if create {
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "BucketsCreated", "Buckets created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "BucketsCreated", "Buckets created")
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/minio-services.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (c *Controller) checkMinIOSvc(ctx context.Context, tenant *miniov2.Tenant,
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "SvcCreated", "MinIO Service Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "SvcCreated", "MinIO Service Created")
} else {
return err
}
Expand Down Expand Up @@ -85,7 +85,7 @@ func (c *Controller) checkMinIOSvc(ctx context.Context, tenant *miniov2.Tenant,
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "Updated", "MinIO Service Updated")
c.recorder.Event(tenant, corev1.EventTypeNormal, "Updated", "MinIO Service Updated")
}
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/minio.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,13 @@ func (c *Controller) createMinIOCSR(ctx context.Context, tenant *miniov2.Tenant)
klog.Errorf("Unexpected error during the creation of the csr/%s: %v", tenant.MinIOCSRName(), err)
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "CSRCreated", "MinIO CSR Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "CSRCreated", "MinIO CSR Created")

// fetch certificate from CSR
certbytes, err := c.fetchCertificate(ctx, tenant.MinIOCSRName())
if err != nil {
klog.Errorf("Unexpected error during the creation of the csr/%s: %v", tenant.MinIOCSRName(), err)
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "CSRFailed", fmt.Sprintf("MinIO CSR Failed to create: %s", err))
c.recorder.Event(tenant, corev1.EventTypeWarning, "CSRFailed", fmt.Sprintf("MinIO CSR Failed to create: %s", err))
return err
}

Expand Down
12 changes: 6 additions & 6 deletions pkg/controller/service-account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ func (c *Controller) checkAndCreateServiceAccount(ctx context.Context, tenant *m
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "SACreated", "Service Account Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "SACreated", "Service Account Created")
} else {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "SAFailed", fmt.Sprintf("Service Account could not be created: %s", err.Error()))
c.recorder.Event(tenant, corev1.EventTypeWarning, "SAFailed", fmt.Sprintf("Service Account could not be created: %s", err.Error()))
return err
}
}
Expand All @@ -57,9 +57,9 @@ func (c *Controller) checkAndCreateServiceAccount(ctx context.Context, tenant *m
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "RoleCreated", "Role Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "RoleCreated", "Role Created")
} else {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "RoleFailed", fmt.Sprintf("Role could not be created: %s", err.Error()))
c.recorder.Event(tenant, corev1.EventTypeWarning, "RoleFailed", fmt.Sprintf("Role could not be created: %s", err.Error()))
return err
}
}
Expand All @@ -71,9 +71,9 @@ func (c *Controller) checkAndCreateServiceAccount(ctx context.Context, tenant *m
if err != nil {
return err
}
c.RegisterEvent(ctx, tenant, corev1.EventTypeNormal, "BindingCreated", "Role Binding Created")
c.recorder.Event(tenant, corev1.EventTypeNormal, "BindingCreated", "Role Binding Created")
} else {
c.RegisterEvent(ctx, tenant, corev1.EventTypeWarning, "BindingFailed", fmt.Sprintf("Role Binding could not be created: %s", err.Error()))
c.recorder.Event(tenant, corev1.EventTypeWarning, "BindingFailed", fmt.Sprintf("Role Binding could not be created: %s", err.Error()))
return err
}
}
Expand Down

0 comments on commit c5b02c4

Please sign in to comment.