github/k3k
1
0
Fork 0
mirror of https://github.com/rancher/k3k.git synced 2026-08-21 13:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1019 from bigkevmcd/fix-event-logging

Browse Source 
Fix logged events in syncer - ensure the name/namespace are correct.
This commit is contained in:
Kevin McDermott
2026-07-14 13:11:30 +01:00
committed by GitHub
parent 07cfe77318
commit ddf6bace3f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
k3k-kubelet/controller/syncer/configmap.go
+1 -1
View File
@@ -83,7 +83,7 @@ func (c *ConfigMapSyncer) filterResources(object client.Object) bool {
// Reconcile implements reconcile.Reconciler and synchronizes the objects in objs to the host cluster
func (c *ConfigMapSyncer) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
log := ctrl.LoggerFrom(ctx).WithValues("cluster", c.ClusterName, "clusterNamespace", c.ClusterName)
log := ctrl.LoggerFrom(ctx).WithValues("cluster", c.ClusterName, "clusterNamespace", c.ClusterNamespace)
ctx = ctrl.LoggerInto(ctx, log)
var cluster v1beta1.Cluster
k3k-kubelet/controller/syncer/events.go
+2 -1
View File
@@ -62,7 +62,8 @@ func AddEventSyncer(ctx context.Context, virtMgr, hostMgr manager.Manager, clust
// Reconcile implements reconcile.Reconciler and synchronizes relevant events
// between the host and virtual clusters.
func (s *EventSyncer) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
logger := ctrl.LoggerFrom(ctx).WithValues("cluster", s.ClusterName, "clusterNamespace", s.ClusterName)
logger := ctrl.LoggerFrom(ctx).WithValues("cluster", s.ClusterName, "clusterNamespace", s.ClusterNamespace)
ctx = ctrl.LoggerInto(ctx, logger)
event := &corev1.Event{}
if err := s.HostClient.Get(ctx, req.NamespacedName, event); err != nil {
k3k-kubelet/controller/syncer/secret.go
+1 -1
View File
@@ -83,7 +83,7 @@ func (r *SecretSyncer) filterResources(object client.Object) bool {
// Reconcile implements reconcile.Reconciler and synchronizes the objects in objs to the host cluster
func (s *SecretSyncer) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
log := ctrl.LoggerFrom(ctx).WithValues("cluster", s.ClusterName, "clusterNamespace", s.ClusterName)
log := ctrl.LoggerFrom(ctx).WithValues("cluster", s.ClusterName, "clusterNamespace", s.ClusterNamespace)
ctx = ctrl.LoggerInto(ctx, log)
var cluster v1beta1.Cluster