Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(AzureVpcPeering): improve log messages #877

Merged
merged 4 commits into from
Dec 17, 2024
Merged

chore(AzureVpcPeering): improve log messages #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0fea01
chore(AzureVpcPeering): improve log messages
vandjelk Dec 10, 2024
7c9003b
Merge branch 'main' into peering/azure/improve-log-messages
vandjelk Dec 16, 2024
65da0bc
Merge branch 'main' into peering/azure/improve-log-messages
vandjelk Dec 17, 2024
abe0135
Merge branch 'main' into peering/azure/improve-log-messages
vandjelk Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/kcp/provider/azure/vpcpeering/deleteVpcPeering.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ func deleteVpcPeering(ctx context.Context, st composed.State) (error, context.Co
obj := state.ObjAsVpcPeering()

if state.localPeering == nil {
logger.Info("VpcPeering deleted before Azure peering is created")
logger.Info("VpcPeering deleted before local VPC peering is created")
return nil, nil
}

resourceId, err := util.ParseResourceID(ptr.Deref(state.localPeering.ID, ""))

if err != nil {
return azuremeta.LogErrorAndReturn(err, "Failed parsing localPeering.ID while deleting local peering", ctx)
return azuremeta.LogErrorAndReturn(err, "Failed parsing localPeering.ID while deleting local VPC peering", ctx)
}

logger.Info("Deleting VpcPeering")
logger.Info("Deleting local VPC peering")

err = state.localClient.DeletePeering(
ctx,
Expand All @@ -34,10 +34,10 @@ func deleteVpcPeering(ctx context.Context, st composed.State) (error, context.Co
)

if err != nil {
return azuremeta.LogErrorAndReturn(err, "Error deleting local vpc peering", ctx)
return azuremeta.LogErrorAndReturn(err, "Error deleting local VPC peering", ctx)
}

logger.Info("Local VpcPeering deleted")
logger.Info("Local VPC peering deleted")

return nil, nil
}
6 changes: 3 additions & 3 deletions pkg/kcp/provider/azure/vpcpeering/peeringLocalCreate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func peeringLocalCreate(ctx context.Context, st composed.State) (error, context.

if azuremeta.IsTooManyRequests(err) {
return composed.LogErrorAndReturn(err,
"Azure vpc peering too many requests on peering local create",
"Too many requests on creating local VPC peering",
composed.StopWithRequeueDelay(util.Timing.T60000ms()),
ctx,
)
Expand Down Expand Up @@ -71,12 +71,12 @@ func peeringLocalCreate(ctx context.Context, st composed.State) (error, context.

return composed.PatchStatus(state.ObjAsVpcPeering()).
SetExclusiveConditions(condition).
ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of local vpc peering").
ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of local VPC peering").
FailedError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).
SuccessError(composed.StopWithRequeueDelay(util.Timing.T60000ms())).
Run(ctx, state)
}

logger.Info("Azure local Peering is created")
logger.Info("Local VPC peering created")
return nil, nil
}
10 changes: 5 additions & 5 deletions pkg/kcp/provider/azure/vpcpeering/peeringLocalLoad.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func peeringLocalLoad(ctx context.Context, st composed.State) (error, context.Co
}

if !ok {
logger.Info("Local Azure Peering not loaded")
logger.Info("Local VPC peering not loaded")
return nil, nil
}

Expand All @@ -48,26 +48,26 @@ func peeringLocalLoad(ctx context.Context, st composed.State) (error, context.Co
if err != nil {
if azuremeta.IsTooManyRequests(err) {
return composed.LogErrorAndReturn(err,
"Azure vpc peering too many requests on peering local load",
"Too many requests on loading local VPC peering",
composed.StopWithRequeueDelay(util.Timing.T10000ms()),
ctx,
)
}

if azuremeta.IsNotFound(err) {
logger.Info("Local Azure Peering not found for KCP VpcPeering")
logger.Info("Local VPC peering not found")
return nil, nil
}

return azuremeta.LogErrorAndReturn(err, "Error loading VPC Peering", ctx)
return azuremeta.LogErrorAndReturn(err, "Error loading local VPC peering", ctx)
}

logger = logger.WithValues("localPeeringId", ptr.Deref(peering.ID, ""))
ctx = composed.LoggerIntoCtx(ctx, logger)

state.localPeering = peering

logger.Info("Azure local Peering loaded for KCP VpcPeering")
logger.Info("Local VPC peering loaded")

return nil, ctx
}
8 changes: 4 additions & 4 deletions pkg/kcp/provider/azure/vpcpeering/peeringRemoteCreate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ func peeringRemoteCreate(ctx context.Context, st composed.State) (error, context
)

if err != nil {
logger.Error(err, "Error creating remote VPC Peering")
logger.Error(err, "Error creating remote VPC peering")

if azuremeta.IsTooManyRequests(err) {
return composed.LogErrorAndReturn(err,
"Azure vpc peering too many requests on peering remote create",
"Too many requests on creating remote VPC peering",
composed.StopWithRequeueDelay(util.Timing.T60000ms()),
ctx,
)
Expand All @@ -54,13 +54,13 @@ func peeringRemoteCreate(ctx context.Context, st composed.State) (error, context
Reason: cloudcontrolv1beta1.ReasonFailedCreatingVpcPeeringConnection,
Message: message,
}).
ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of remote vpc peering").
ErrorLogMessage("Error updating KCP VpcPeering status on failed creation of remote VPC peering").
FailedError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).
SuccessError(composed.StopWithRequeueDelay(util.Timing.T60000ms())).
Run(ctx, state)
}

logger.Info("Azure remote VPC Peering created")
logger.Info("Remote VPC peering created")

return nil, nil
}
8 changes: 4 additions & 4 deletions pkg/kcp/provider/azure/vpcpeering/peeringRemoteDelete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func peeringRemoteDelete(ctx context.Context, st composed.State) (error, context
}

if state.remotePeering == nil {
logger.Info("Azure remote peering not loaded, continuing")
logger.Info("Remote VPC peering not loaded, continuing")
return nil, nil
}

Expand All @@ -39,13 +39,13 @@ func peeringRemoteDelete(ctx context.Context, st composed.State) (error, context
state.ObjAsVpcPeering().Spec.Details.PeeringName,
)

logger.Info("Deleting remote VpcPeering")
logger.Info("Deleting remote VPC peering")

if err != nil {
return composed.LogErrorAndReturn(err, "Error deleting vpc peering", nil, ctx)
return composed.LogErrorAndReturn(err, "Error deleting VPC peering", nil, ctx)
}

logger.Info("Remote VpcPeering deleted")
logger.Info("Remote VPC peering deleted")

return nil, nil
}
8 changes: 4 additions & 4 deletions pkg/kcp/provider/azure/vpcpeering/peeringRemoteLoad.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C

if azuremeta.IsTooManyRequests(err) {
return composed.LogErrorAndReturn(err,
"Azure vpc peering too many requests on peering remote load",
"Too many requests on loading remote VPC peering",
composed.StopWithRequeueDelay(util.Timing.T60000ms()),
ctx,
)
}

logger.Error(err, "Error loading remote VPC Peering")
logger.Error(err, "Error loading Azure remote VPC peering")

message, isWarning := azuremeta.GetErrorMessage(err)

Expand Down Expand Up @@ -99,7 +99,7 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C

return composed.PatchStatus(state.ObjAsVpcPeering()).
SetExclusiveConditions(condition).
ErrorLogMessage("Error updating KCP VpcPeering status on failed loading of remote vpc peering").
ErrorLogMessage("Error updating KCP VpcPeering status on failed loading of remote VPC peering").
FailedError(composed.StopWithRequeueDelay(util.Timing.T10000ms())).
SuccessErrorNil().
Run(ctx, state)
Expand All @@ -110,7 +110,7 @@ func peeringRemoteLoad(ctx context.Context, st composed.State) (error, context.C

state.remotePeering = peering

logger.Info("Azure remote VPC peering loaded")
logger.Info("Remote VPC peering loaded")

return nil, ctx
}
2 changes: 1 addition & 1 deletion pkg/kcp/provider/azure/vpcpeering/remoteClientCreate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func remoteClientCreate(ctx context.Context, st composed.State) (error, context.
Type: cloudcontrolv1beta1.ConditionTypeError,
Status: metav1.ConditionTrue,
Reason: cloudcontrolv1beta1.ReasonCloudProviderError,
Message: fmt.Sprintf("Faile creating Azure client for tenant %s subscription %s", state.remoteNetworkId.Subscription, tenantId),
Message: fmt.Sprintf("Failed creating Azure client for tenant %s subscription %s", state.remoteNetworkId.Subscription, tenantId),
}).
ErrorLogMessage("Error patching KCP VpcPeering with error state after remote client creation failed").
SuccessError(composed.StopWithRequeueDelay(util.Timing.T300000ms())). // try again in 5mins
Expand Down
4 changes: 2 additions & 2 deletions pkg/kcp/provider/azure/vpcpeering/vpcRemoteLoad.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func vpcRemoteLoad(ctx context.Context, st composed.State) (error, context.Conte
// stop and forget.
if azuremeta.IsNotFound(err) {
successError = composed.StopAndForget
message = "Remote VPC Network not found"
message = "Remote VPC network not found"
logger.Info(message)
}

Expand Down Expand Up @@ -60,7 +60,7 @@ func vpcRemoteLoad(ctx context.Context, st composed.State) (error, context.Conte

return composed.UpdateStatus(state.ObjAsVpcPeering()).
SetCondition(condition).
ErrorLogMessage("Error updating VpcPeering status due to failed loading of remote vpc network").
ErrorLogMessage("Error updating VpcPeering status due to failed loading of remote VPC network").
FailedError(composed.StopWithRequeue).
SuccessError(successError).
Run(ctx, state)
Expand Down
6 changes: 3 additions & 3 deletions pkg/kcp/provider/azure/vpcpeering/waitNetworkTag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ func waitNetworkTag(ctx context.Context, st composed.State) (error, context.Cont
kv = append(kv, k, v)
}

logger.Info("Loaded remote VPC Network have no matching tags", kv...)
logger.Info("Loaded remote VPC network have no matching tags", kv...)

return composed.UpdateStatus(obj).
SetCondition(metav1.Condition{
Type: cloudcontrolv1beta1.ConditionTypeError,
Status: "True",
Reason: cloudcontrolv1beta1.ReasonFailedLoadingRemoteVpcNetwork,
Message: "Loaded remote Vpc network has no matching tags",
Message: "Loaded remote VPC network has no matching tags",
}).
ErrorLogMessage("Error updating VpcPeering status due to remote vpc network tag mismatch").
ErrorLogMessage("Error updating VpcPeering status due to remote VPC network tag mismatch").
FailedError(composed.StopWithRequeue).
SuccessError(composed.StopWithRequeueDelay(util.Timing.T60000ms())).
Run(ctx, state)
Expand Down
Loading