Skip to content

Commit

Permalink
using managed cluster instead of spoke in log msg (#512)
Browse files Browse the repository at this point in the history
Signed-off-by: Wei Liu <liuweixa@redhat.com>
  • Loading branch information
skeeey authored Jun 12, 2024
1 parent 8e792c1 commit 8e5d1a1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkg/registration/clientcert/certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func NewCSRControl(logger klog.Logger, hubCSRInformer certificatesinformers.Inte
hubCSRLister: hubCSRInformer.V1beta1().CertificateSigningRequests().Lister(),
hubCSRClient: hubKubeClient.CertificatesV1beta1().CertificateSigningRequests(),
}
logger.Info("Using v1beta1 CSR api to manage spoke client certificate")
logger.Info("Using v1beta1 CSR api to manage managed cluster client certificate")
return csrCtrl, nil
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/registration/hub/csr/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (r *csrRenewalReconciler) Reconcile(ctx context.Context, csr csrInfo, appro
return reconcileContinue, err
}

r.eventRecorder.Eventf("ManagedClusterCSRAutoApproved", "spoke cluster csr %q is auto approved by hub csr controller", csr.name)
r.eventRecorder.Eventf("ManagedClusterCSRAutoApproved", "managed cluster csr %q is auto approved by hub csr controller", csr.name)
return reconcileStop, nil
}

Expand Down Expand Up @@ -123,7 +123,7 @@ func (b *csrBootstrapReconciler) Reconcile(ctx context.Context, csr csrInfo, app
return reconcileContinue, err
}

b.eventRecorder.Eventf("ManagedClusterAutoApproved", "spoke cluster %q is auto approved.", clusterName)
b.eventRecorder.Eventf("ManagedClusterAutoApproved", "managed cluster %q is auto approved.", clusterName)
return reconcileStop, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/registration/hub/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func (m *HubManagerOptions) RunControllerManagerWithInformers(
csrReconciles,
controllerContext.EventRecorder,
)
logger.Info("Using v1beta1 CSR api to manage spoke client certificate")
logger.Info("Using v1beta1 CSR api to manage managed cluster client certificate")
}
}
if csrController == nil {
Expand Down

0 comments on commit 8e5d1a1

Please sign in to comment.