From 1e86d0c2a9b35327db7620ec5a9ee9e7acfb61a7 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Wed, 8 Jul 2020 12:46:37 +0200 Subject: [PATCH] Also print cluster name. --- pkg/controller/infrastructure/actuator_reconcile.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controller/infrastructure/actuator_reconcile.go b/pkg/controller/infrastructure/actuator_reconcile.go index 5d74eaf7f..11fa03add 100644 --- a/pkg/controller/infrastructure/actuator_reconcile.go +++ b/pkg/controller/infrastructure/actuator_reconcile.go @@ -150,7 +150,7 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { if err != nil { return err } - r.logger.Info("firewall created", "cluster", r.clusterID, "machine-id", r.providerStatus.Firewall.MachineID) + r.logger.Info("firewall created", "cluster-id", r.clusterID, "cluster-name", r.cluster.Shoot.Name, "machine-id", r.providerStatus.Firewall.MachineID) return nil case firewallActionUpdateCreationProgress: succeeded, err := hasFirewallSucceeded(r.machineID, r.mclient) @@ -158,7 +158,7 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { return err } - r.logger.Info("firewall creation in progress", "cluster", r.clusterID, "succeeded", succeeded) + r.logger.Info("firewall creation in progress", "cluster-id", r.clusterID, "cluster-name", r.cluster.Shoot.Name, "succeeded", succeeded) r.providerStatus.Firewall.Succeeded = succeeded return updateProviderStatus(ctx, r.c, r.infrastructure, r.providerStatus, r.infrastructure.Status.NodesCIDR) case firewallActionRecreate: @@ -166,24 +166,24 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { if err != nil { return err } - r.logger.Info("firewall removed from status", "cluster", r.clusterID) + r.logger.Info("firewall removed from status", "cluster-id", r.clusterID, "cluster-name", r.cluster.Shoot.Name, "machine-id", r.machineID) err = createFirewall(ctx, r) if err != nil { return err } - r.logger.Info("firewall created", "cluster", r.clusterID, "machine-id", r.providerStatus.Firewall.MachineID) + r.logger.Info("firewall created", "cluster-id", r.clusterID, "cluster-name", r.cluster.Shoot.Name, "machine-id", r.providerStatus.Firewall.MachineID) return nil case firewallActionDeleteAndRecreate: err := deleteFirewallFromStatus(ctx, r) if err != nil { return err } - r.logger.Info("firewall removed from status", "cluster", r.clusterID, "machine-id", r.machineID) + r.logger.Info("firewall removed from status", "cluster-id", r.clusterID, "cluster-name", r.cluster.Shoot.Name, "machine-id", r.machineID) err = deleteFirewall(r.logger, r.machineID, r.infrastructureConfig.ProjectID, r.clusterTag, r.mclient) if err != nil { return err } - r.logger.Info("firewall deleted", "cluster", r.clusterID, "machine-id", r.machineID) + r.logger.Info("firewall deleted", "cluster-id", r.clusterID, "cluster-name", r.cluster.Shoot.Name, "machine-id", r.machineID) err = createFirewall(ctx, r) if err != nil { return err