Skip to content

Commit

Permalink
It's fine, detection works as expected.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerrit91 committed Jul 8, 2020
1 parent 1edee3c commit 0a95250
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions pkg/controller/infrastructure/actuator_reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallRec

if fw.Size.ID != nil && *fw.Size.ID != r.infrastructureConfig.Firewall.Size {
r.logger.Info("firewall size has changed", "clusterid", r.clusterID, "machineid", r.machineID, "current", *fw.Size.ID, "new", r.infrastructureConfig.Firewall.Size)
// FIXME: Comment in when tested thoroughly
// return firewallActionDeleteAndRecreate, nil
return firewallActionDeleteAndRecreate, nil
}

if fw.Allocation != nil && fw.Allocation.Image != nil && fw.Allocation.Image.ID != nil && *fw.Allocation.Image.ID != r.infrastructureConfig.Firewall.Image {
Expand All @@ -240,8 +239,7 @@ func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallRec

if image.Image != nil && image.Image.ID != nil && *image.Image.ID != *fw.Allocation.Image.ID {
r.logger.Info("firewall image has changed", "clusterid", r.clusterID, "machineid", r.machineID, "current", *fw.Allocation.Image.ID, "new", *image.Image.ID)
// FIXME: Comment in when tested thoroughly
// return firewallActionDeleteAndRecreate, nil
return firewallActionDeleteAndRecreate, nil
}
}

Expand All @@ -261,8 +259,7 @@ func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallRec
}
if !currentNetworks.Equal(wantNetworks) {
r.logger.Info("firewall networks have changed", "clusterid", r.clusterID, "machineid", r.machineID, "current", currentNetworks.List(), "new", wantNetworks.List())
// FIXME: Comment in when tested thoroughly
// return firewallActionDeleteAndRecreate, nil
return firewallActionDeleteAndRecreate, nil
}

return firewallActionDoNothing, nil
Expand Down

0 comments on commit 0a95250

Please sign in to comment.