Also print cluster name.

metal-stack · Jul 8, 2020 · 1e86d0c · 1e86d0c
1 parent 0a95250
commit 1e86d0c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pkg/controller/infrastructure/actuator_reconcile.go b/pkg/controller/infrastructure/actuator_reconcile.go
@@ -150,40 +150,40 @@ 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)
 		if err != nil {
 			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:
 		err := deleteFirewallFromStatus(ctx, r)
 		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